nodejs · cjihrig · Dec 20, 2016 · Nov 28, 2016 · Dec 6, 2016 · Nov 25, 2016
diff --git a/.eslintrc b/.eslintrc
@@ -93,6 +93,7 @@ rules:
   no-multiple-empty-lines: [2, {max: 2, maxEOF: 0, maxBOF: 0}]
   no-tabs: 2
   no-trailing-spaces: 2
+  operator-linebreak: [2, after, {overrides: {'?': ignore, ':': ignore}}]
   quotes: [2, single, avoid-escape]
   semi: 2
   semi-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 -j8 test` (UNIX), or `vcbuild test nosign` (Windows) passes
+- [ ] `make -j4 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/BUILDING.md b/BUILDING.md
@@ -24,16 +24,33 @@ On OS X, you will also need:
     this under the menu `Xcode -> Preferences -> Downloads`
   * This step will install `gcc` and the related toolchain containing `make`
 
+* You may want to setup [firewall rules](tools/macosx-firewall.sh) to avoid
+popups asking to accept incoming network connections when running tests:
+
+```console
+$ sudo ./tools/macosx-firewall.sh
+```
+Running this script will add rules for the executable `node` in the out
+directory and the symbolic `node` link in the projects root directory.
+
 On FreeBSD and OpenBSD, you may also need:
 * libexecinfo
 
 To build Node.js:
 
 ```console
 $ ./configure
-$ make
+$ make -j4
 ```
 
+Running `make` with the `-j4` flag will cause it to run 4 compilation jobs
+concurrently which may significantly reduce build time. The number after `-j`
+can be changed to best suit the number of processor cores on your machine. If
+you run into problems running `make` with concurrency, try running it without
+the `-j4` flag. See the
+[GNU Make Documentation](https://www.gnu.org/software/make/manual/html_node/Parallel.html)
+for more information.
+
 Note that the above requires that `python` resolve to Python 2.6 or 2.7 and not a newer version.
 
 To run the tests:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,7 +28,8 @@ release.
 </tr>
 <tr>
   <td valign="top">
-    <b><a href="doc/changelogs/CHANGELOG_V7.md#7.2.1">7.2.1</a></b><br/>
+    <b><a href="doc/changelogs/CHANGELOG_V7.md#7.3.0">7.3.0</a></b><br/>
+    <a href="doc/changelogs/CHANGELOG_V7.md#7.2.1">7.2.1</a><br/>
     <a href="doc/changelogs/CHANGELOG_V7.md#7.2.0">7.2.0</a><br/>
     <a href="doc/changelogs/CHANGELOG_V7.md#7.1.0">7.1.0</a><br/>
     <a href="doc/changelogs/CHANGELOG_V7.md#7.0.0">7.0.0</a><br/>

diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md
@@ -126,7 +126,7 @@ information regarding the change process:
   - Protects against the assumption that GitHub will be around forever.
 
 Review the commit message to ensure that it adheres to the guidelines
-outlined in the [contributing](https://github.com/nodejs/node/blob/master/CONTRIBUTING.md#step-3-commit) guide.
+outlined in the [contributing](./CONTRIBUTING.md#step-3-commit) guide.
 
 See the commit log for examples such as
 [this one](https://github.com/nodejs/node/commit/b636ba8186) if unsure
@@ -237,7 +237,8 @@ Save the file and close the editor. You'll be asked to enter a new
 commit message for that commit. This is a good moment to fix incorrect
 commit logs, ensure that they are properly formatted, and add
 `Reviewed-By` lines.
-* The commit message text must conform to the [commit message guidelines](../CONTRIBUTING.md#step-3-commit).
+* The commit message text must conform to the
+[commit message guidelines](./CONTRIBUTING.md#step-3-commit).
 
 Time to push it:
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -156,7 +156,7 @@ to see how they should be structured can also help.
 To run the tests on Unix / OS X:
 
 ```text
-$ ./configure && make -j8 test
+$ ./configure && make -j4 test
 ```
 
 Windows:
@@ -189,7 +189,7 @@ You can run tests directly with node:
 $ ./node ./test/parallel/test-stream2-transform.js
 ```
 
-Remember to recompile with `make -j8` in between test runs if you change
+Remember to recompile with `make -j4` in between test runs if you change
 core modules.
 
 ### Step 6: Push

diff --git a/Makefile b/Makefile
@@ -64,13 +64,18 @@ endif
 # to check for changes.
 .PHONY: $(NODE_EXE) $(NODE_G_EXE)
 
+# The -r/-L check stops it recreating the link if it is already in place,
+# otherwise $(NODE_EXE) being a .PHONY target means it is always re-run.
+# Without the check there is a race condition between the link being deleted
+# and recreated which can break the addons build when running test-ci
+# See comments on the build-addons target for some more info
 $(NODE_EXE): config.gypi out/Makefile
 	$(MAKE) -C out BUILDTYPE=Release V=$(V)
-	ln -fs out/Release/$(NODE_EXE) $@
+	if [ ! -r $@ -o ! -L $@ ]; then ln -fs out/Release/$(NODE_EXE) $@; fi
 
 $(NODE_G_EXE): config.gypi out/Makefile
 	$(MAKE) -C out BUILDTYPE=Debug V=$(V)
-	ln -fs out/Debug/$(NODE_EXE) $@
+	if [ ! -r $@ -o ! -L $@ ]; then ln -fs out/Debug/$(NODE_EXE) $@; fi
 
 out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp \
               deps/zlib/zlib.gyp deps/v8/gypfiles/toolchain.gypi \

diff --git a/README.md b/README.md
@@ -237,8 +237,8 @@ more information about the governance of the Node.js project, see
 **Ilkka Myller** &lt;[email protected]&gt;
 * [isaacs](https://github.com/isaacs) -
 **Isaac Z. Schlueter** &lt;[email protected]&gt;
-* [italoacasas](https://github.com/italoacasas)
-**Italo A. Casas**  &lt;[email protected]&gt;
+* [italoacasas](https://github.com/italoacasas) -
+**Italo A. Casas** &lt;[email protected]&gt;
 * [iWuzHere](https://github.com/iWuzHere) -
 **Imran Iqbal** &lt;[email protected]&gt;
 * [JacksonTian](https://github.com/JacksonTian) -

diff --git a/benchmark/README.md b/benchmark/README.md
@@ -50,6 +50,21 @@ install.packages("ggplot2")
 install.packages("plyr")
 ```
 
+### CRAN Mirror Issues
+In the event you get a message that you need to select a CRAN mirror first.
+
+You can specify a mirror by adding in the repo parameter.
+
+If we used the "http://cran.us.r-project.org" mirror, it could look somehting like
+this:
+
+```R
+install.packages("ggplot2", repo="http://cran.us.r-project.org")
+```
+
+Of course, use the mirror that suits your location.
+A list of mirrors is [located here](https://cran.r-project.org/mirrors.html).
+
 ## Running benchmarks
 
 ### Running individual benchmarks

diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 5
 #define V8_MINOR_VERSION 4
 #define V8_BUILD_NUMBER 500
-#define V8_PATCH_LEVEL 44
+#define V8_PATCH_LEVEL 45
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)

diff --git a/deps/v8/src/base/platform/time.cc b/deps/v8/src/base/platform/time.cc
@@ -639,7 +639,7 @@ bool TimeTicks::IsHighResolutionClockWorking() {
 
 bool ThreadTicks::IsSupported() {
 #if (defined(_POSIX_THREAD_CPUTIME) && (_POSIX_THREAD_CPUTIME >= 0)) || \
-  defined(V8_OS_MACOSX) || defined(V8_OS_ANDROID)
+    defined(V8_OS_MACOSX) || defined(V8_OS_ANDROID) || defined(V8_OS_SOLARIS)
   return true;
 #elif defined(V8_OS_WIN)
   return IsSupportedWin();
@@ -655,6 +655,8 @@ ThreadTicks ThreadTicks::Now() {
 #elif(defined(_POSIX_THREAD_CPUTIME) && (_POSIX_THREAD_CPUTIME >= 0)) || \
   defined(V8_OS_ANDROID)
   return ThreadTicks(ClockNow(CLOCK_THREAD_CPUTIME_ID));
+#elif V8_OS_SOLARIS
+  return ThreadTicks(gethrvtime() / Time::kNanosecondsPerMicrosecond);
 #elif V8_OS_WIN
   return ThreadTicks::GetForThread(::GetCurrentThread());
 #else