meta: merge node/master into node-chakracore/master

Merge c016cc2 as of 2018-01-25 This commit was automatically generated. For any problems, please contact jackhorton Reviewed-By: Jimmy Thomson <jithomso@microsoft.com>
nodejs · Feb 8, 2018 · b9518a5 · b9518a5
2 parents 8c30a84 + c016cc2
commit b9518a5
Show file tree

Hide file tree

Showing 2,237 changed files with 93,744 additions and 81,256 deletions.
diff --git a/.gitignore b/.gitignore
@@ -75,6 +75,7 @@ ipch/
 /npm.wxs
 /tools/msvs/npm.wixobj
 /tools/msvs/genfiles/
+/test/addons/??_*/
 email.md
 deps/v8-*
 deps/icu

diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md
@@ -623,7 +623,7 @@ error: failed to push some refs to 'https://github.com/nodejs/node'
 hint: Updates were rejected because the remote contains work that you do
 hint: not have locally. This is usually caused by another repository pushing
 hint: to the same ref. You may want to first integrate the remote changes
-hint: (e.g., 'git pull ...') before pushing again.
+hint: (e.g. 'git pull ...') before pushing again.
 hint: See the 'Note about fast-forwards' in 'git push --help' for details.
 ```