nodejs · jasnell · Oct 14, 2016 · Sep 15, 2016 · Sep 17, 2016 · Sep 22, 2016
diff --git a/.eslintrc b/.eslintrc
@@ -80,7 +80,7 @@ rules:
   max-len: [2, 80, 2]
   new-parens: 2
   no-mixed-spaces-and-tabs: 2
-  no-multiple-empty-lines: [2, {max: 2}]
+  no-multiple-empty-lines: [2, {max: 2, maxEOF: 0, maxBOF: 0}]
   no-tabs: 2
   no-trailing-spaces: 2
   quotes: [2, single, avoid-escape]
@@ -103,7 +103,7 @@ rules:
   no-dupe-class-members: 2
   no-new-symbol: 2
   no-this-before-super: 2
-  prefer-const: 2
+  prefer-const: [2, {ignoreReadBeforeAssign: true}]
   rest-spread-spacing: 2
   template-curly-spacing: 2
 

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -9,7 +9,7 @@ Contributors guide: https://github.com/nodejs/node/blob/master/CONTRIBUTING.md
 ##### Checklist
 <!-- Remove items that do not apply. For completed items, change [ ] to [x]. -->
 
-- [ ] `make -j4 test` (UNIX), or `vcbuild test nosign` (Windows) passes
+- [ ] `make -j8 test` (UNIX), or `vcbuild test nosign` (Windows) passes
 - [ ] tests and/or benchmarks are included
 - [ ] documentation is changed or added
 - [ ] commit message follows commit guidelines

diff --git a/.remarkrc b/.remarkrc
@@ -1,34 +1,62 @@
 {
   "plugins": {
-    "remark-lint": {
-      "code-block-style": false,
+    "remark-lint/": {
+      "blockquote-indentation": 2,
+      "checkbox-character-style": { "checked": "x", "unchecked": " " },
+      "checkbox-content-indent": true,
+      "code-block-style": "fenced",
       "definition-case": false,
+      "definition-spacing": true,
       "emphasis-marker": false,
-      "first-heading-level": false,
+      "fenced-code-flag": true,
+      "fenced-code-marker": "`",
+      "file-extension": "md",
+      "final-definition": true,
+      "final-newline": true,
+      "first-heading-level": 1,
+      "hard-break-spaces": true,
       "heading-increment": false,
-      "list-item-content-indent": false,
+      "heading-style": "atx",
+      "link-title-style": false,
       "list-item-bullet-indent": false,
+      "list-item-content-indent": false,
       "list-item-indent": false,
       "list-item-spacing": false,
       "maximum-heading-length": false,
       "maximum-line-length": false,
+      "no-auto-link-without-protocol": true,
+      "no-blockquote-without-caret": true,
       "no-consecutive-blank-lines": false,
+      "no-duplicate-definitions": true,
       "no-duplicate-headings": false,
       "no-emphasis-as-heading": false,
-      "no-file-name-articles": false,
+      "no-file-name-articles": true,
+      "no-file-name-consecutive-dashes": true,
       "no-file-name-irregular-characters": false,
+      "no-file-name-mixed-case": false,
+      "no-file-name-outer-dashes": true,
+      "no-heading-content-indent": true,
+      "no-heading-indent": true,
       "no-heading-punctuation": false,
       "no-html": false,
-      "no-inline-padding": false,
-      "no-shell-dollars": false,
-      "no-shortcut-reference-link": false,
+      "no-inline-padding": true,
       "no-literal-urls": false,
       "no-missing-blank-lines": false,
-      "no-multiple-toplevel-headings": false,
+      "no-multiple-toplevel-headings": true,
+      "no-shell-dollars": true,
+      "no-shortcut-reference-image": true,
+      "no-shortcut-reference-link": false,
+      "no-table-indentation": true,
+      "no-tabs": true,
       "no-undefined-references": false,
+      "no-unused-definitions": true,
       "ordered-list-marker-style": false,
       "ordered-list-marker-value": false,
+      "rule-style": true,
+      "strong-marker": "*",
+      "table-cell-padding": "padded",
       "table-pipe-alignment": false,
+      "table-pipes": true,
       "unordered-list-marker-style": false
     }
   }

diff --git a/BUILDING.md b/BUILDING.md
@@ -1,4 +1,4 @@
-## Building Node.js
+# Building Node.js
 
 Depending on what platform or features you require, the build process may
 differ slightly. After you've successfully built a binary, running the
@@ -34,14 +34,7 @@ $ ./configure
 $ make
 ```
 
-If your Python binary is in a non-standard location or has a
-non-standard name, run the following instead:
-
-```console
-$ export PYTHON=/path/to/python
-$ $PYTHON ./configure
-$ make
-```
+Note that the above requires that `python` resolve to Python 2.6 or 2.7 and not a newer version.
 
 To run the tests:
 
@@ -105,13 +98,13 @@ Prerequisites:
   and tools which can be included in the global `PATH`.
 
 ```console
-> vcbuild nosign
+> .\vcbuild nosign
 ```
 
 To run the tests:
 
 ```console
-> vcbuild test
+> .\vcbuild test
 ```
 
 To test if Node.js was built correctly:
@@ -169,7 +162,7 @@ $ ./configure --with-intl=full-icu --download=all
 ##### Windows:
 
 ```console
-> vcbuild full-icu download-all
+> .\vcbuild full-icu download-all
 ```
 
 #### Building without Intl support
@@ -186,7 +179,7 @@ $ ./configure --without-intl
 ##### Windows:
 
 ```console
-> vcbuild without-intl
+> .\vcbuild without-intl
 ```
 
 #### Use existing installed ICU (Unix / OS X only):
@@ -229,7 +222,7 @@ First unpack latest ICU to `deps/icu`
 as `deps/icu` (You'll have: `deps/icu/source/...`)
 
 ```console
-> vcbuild full-icu
+> .\vcbuild full-icu
 ```
 
 ## Building Node.js with FIPS-compliant OpenSSL

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,7 +26,8 @@ release.
 </tr>
 <tr>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V6.md#6.6.0">6.6.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V6.md#6.7.0">6.7.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V6.md#6.6.0">6.6.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V6.md#6.5.0">6.5.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V6.md#6.4.0">6.4.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V6.md#6.3.1">6.3.1</a><br/>

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -1,6 +1,6 @@
-## Code of Conduct
+# Code of Conduct
 
-### Conduct
+## Conduct
 
 * We are committed to providing a friendly, safe and welcoming
   environment for all, regardless of level of experience, gender
@@ -38,17 +38,17 @@
   documentation. There is no need to address persons when explaining
   code (e.g. "When the developer").
 
-### Contact
+## Contact
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported by:
 
 * Emailing [[email protected]](mailto:[email protected]) (this will email all TSC members)
 * Contacting [individual TSC members](https://nodejs.org/en/foundation/tsc/#current-members-of-the-technical-steering-committee).
 
-### Moderation
+## Moderation
 See the TSC's [moderation policy](https://github.com/nodejs/TSC/blob/master/Moderation-Policy.md) for details about moderation.
 
-### Attribution
+## Attribution
 
 This Code of Conduct is adapted from [Rust's wonderful
 CoC](http://www.rust-lang.org/conduct.html) as well as the

diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md
@@ -101,6 +101,8 @@ information regarding the change process:
 
 - A `Reviewed-By: Name <email>` line for yourself and any
   other Collaborators who have reviewed the change.
+  - Useful for @mentions / contact list if something goes wrong in the PR.
+  - Protects against the assumption that GitHub will be around forever.
 - A `PR-URL:` line that references the *full* GitHub URL of the original
   pull request being merged so it's easy to trace a commit back to the
   conversation that led up to that change.

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -93,15 +93,19 @@ Writing good commit logs is important. A commit log should describe what
 changed and why. Follow these guidelines when writing one:
 
 1. The first line should be 50 characters or less and contain a short
-   description of the change prefixed with the name of the changed
-   subsystem (e.g. "net: add localAddress and localPort to Socket").
+   description of the change. All words in the description should be in
+   lowercase with the exception of proper nouns, acronyms, and the ones that
+   refer to code, like function/variable names. The description should
+   be prefixed with the name of the changed subsystem and start with an
+   imperative verb, for example, "net: add localAddress and localPort
+   to Socket".
 2. Keep the second line blank.
 3. Wrap all other lines at 72 columns.
 
 A good commit log can look something like this:
 
 ```txt
-subsystem: explaining the commit in one line
+subsystem: explain the commit in one line
 
 Body of commit message is a few lines of text, explaining things
 in more detail, possibly giving some background about the issue

diff --git a/GOVERNANCE.md b/GOVERNANCE.md
@@ -23,14 +23,11 @@ The [nodejs/node](https://github.com/nodejs/node) GitHub repository is
 maintained by the CTC and additional Collaborators who are added by the
 CTC on an ongoing basis.
 
-Individuals making significant and valuable contributions are made
-Collaborators and given commit-access to the project. These
-individuals are identified by the CTC and their addition as
-Collaborators is discussed during the weekly CTC meeting.
+Individuals identified by the CTC as making significant and valuable
+contributions are made Collaborators and given commit access to the project.
 
 _Note:_ If you make a significant contribution and are not considered
-for commit-access, log an issue or contact a CTC member directly and it
-will be brought up in the next CTC meeting.
+for commit access, log an issue or contact a CTC member directly.
 
 Modifications of the contents of the nodejs/node repository are made on
 a collaborative basis. Anybody with a GitHub account may propose a
@@ -44,11 +41,9 @@ participate and there is disagreement around a particular
 modification. See [Consensus Seeking Process](#consensus-seeking-process) below
 for further detail on the consensus model used for governance.
 
-Collaborators may opt to elevate significant or controversial
-modifications, or modifications that have not found consensus to the
-CTC for discussion by assigning the ***ctc-agenda*** tag to a pull
-request or issue. The CTC should serve as the final arbiter where
-required.
+Collaborators may opt to elevate significant or controversial modifications to
+the CTC by assigning the ***ctc-agenda*** tag to a pull request or issue. The
+CTC should serve as the final arbiter where required.
 
 For the current list of Collaborators, see the project
 [README.md](./README.md#current-project-team-members).
@@ -127,7 +122,7 @@ group of Collaborators.
 
 Any community member or contributor can ask that something be added to
 the next meeting's agenda by logging a GitHub issue. Any Collaborator,
-CTC member or the moderator can add the item to the agenda by adding
+CTC member, or the moderator can add the item to the agenda by adding
 the ***ctc-agenda*** tag to the issue.
 
 Prior to each CTC meeting, the moderator will share the agenda with
@@ -141,6 +136,20 @@ participate in a non-voting capacity.
 The moderator is responsible for summarizing the discussion of each agenda item
 and sending it as a pull request after the meeting.
 
+Due to the challenges of scheduling a global meeting with participants in
+several timezones, the CTC will seek to resolve as many agenda items as possible
+outside of meetings using
+[the CTC issue tracker](https://github.com/nodejs/CTC/issues). The process in
+the issue tracker is:
+
+* A CTC member opens an issue explaining the proposal/issue and @-mentions
+  @nodejs/ctc.
+* After 72 hours, if there are two or more `LGTM`s from other CTC members and no
+  explicit opposition from other CTC members, then the proposal is approved.
+* If there are any CTC members objecting, then a conversation ensues until
+  either the proposal is dropped or the objecting members are persuaded. If
+  there is an extended impasse, a motion for a vote may be made.
+
 ## Consensus Seeking Process
 
 The CTC follows a

diff --git a/Makefile b/Makefile
@@ -71,15 +71,14 @@ $(NODE_G_EXE): config.gypi out/Makefile
 	$(MAKE) -C out BUILDTYPE=Debug V=$(V)
 	ln -fs out/Debug/$(NODE_EXE) $@
 
-out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp deps/v8/build/toolchain.gypi deps/v8/build/features.gypi deps/v8/tools/gyp/v8.gyp node.gyp config.gypi
+out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp \
+              deps/zlib/zlib.gyp deps/v8/gypfiles/toolchain.gypi \
+              deps/v8/gypfiles/features.gypi deps/v8/src/v8.gyp node.gyp \
+              config.gypi
 	$(PYTHON) tools/gyp_node.py -f make
 
 config.gypi: configure
-	if [ -f $@ ]; then
-		$(error Stale $@, please re-run ./configure)
-	else
-		$(error No $@, please run ./configure first)
-	fi
+	$(error Missing or stale $@, please run ./$<)
 
 install: all
 	$(PYTHON) tools/install.py $@ '$(DESTDIR)' '$(PREFIX)'
@@ -105,7 +104,6 @@ distclean:
 	-rm -rf deps/icu4c*.tgz deps/icu4c*.zip deps/icu-tmp
 	-rm -f $(BINARYTAR).* $(TARBALL).*
 	-rm -rf deps/v8/testing/gmock
-	-rm -rf deps/v8/testing/gtest
 
 check: test
 
@@ -162,7 +160,7 @@ test/addons/.buildstamp: config.gypi \
 	deps/npm/node_modules/node-gyp/package.json \
 	$(ADDONS_BINDING_GYPS) $(ADDONS_BINDING_SOURCES) \
 	deps/uv/include/*.h deps/v8/include/*.h \
-	src/node.h src/node_buffer.h src/node_object_wrap.h \
+	src/node.h src/node_buffer.h src/node_object_wrap.h src/node_version.h \
 	test/addons/.docbuildstamp
 	# Cannot use $(wildcard test/addons/*/) here, it's evaluated before
 	# embedded addons have been generated from the documentation.
@@ -209,6 +207,7 @@ test-ci-js:
 		$(TEST_CI_ARGS) $(CI_JS_SUITES)
 
 test-ci: | build-addons
+	out/Release/cctest --gtest_output=tap:cctest.tap
 	$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
 		--mode=release --flaky-tests=$(FLAKY_TESTS) \
 		$(TEST_CI_ARGS) $(CI_NATIVE_SUITES) $(CI_JS_SUITES)

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ source libraries in the world.
 
 The Node.js project is supported by the
 [Node.js Foundation](https://nodejs.org/en/foundation/). Contributions,
-policies and releases are managed under an
+policies, and releases are managed under an
 [open governance model](./GOVERNANCE.md). We are also bound by a
 [Code of Conduct](./CODE_OF_CONDUCT.md).
 
@@ -44,7 +44,7 @@ The Node.js project maintains multiple types of releases:
   versioned by [SemVer](http://semver.org/) and signed by a member of the
   [Release Team](#release-team).
   Code for Current releases is organized in this repository by major version
-  number, For example: [v4.x](https://github.com/nodejs/node/tree/v4.x).
+  number. For example: [v4.x](https://github.com/nodejs/node/tree/v4.x).
   The major version number of Current releases will increment every 6 months
   allowing for breaking changes to be introduced. This happens in April and
   October every year. Current release lines beginning in October each year have
@@ -240,7 +240,7 @@ more information about the governance of the Node.js project, see
 * [iWuzHere](https://github.com/iWuzHere) -
 **Imran Iqbal** &lt;[email protected]&gt;
 * [JacksonTian](https://github.com/JacksonTian) -
-**Jackson Tian** &lt;shvyo1987@gmail.com&gt;
+**Jackson Tian** &lt;shyvo1987@gmail.com&gt;
 * [jbergstroem](https://github.com/jbergstroem) -
 **Johan Bergström** &lt;[email protected]&gt;
 * [jhamhader](https://github.com/jhamhader) -