Merge v1.8.1 #1482
Merged
Merge v1.8.1 #1482
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PR-URL: #1460 Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Notable Changes:
* build: revert vcbuild.bat changes
* changes inherited from v1.8.0:
* build: Support for building io.js as a static
library (Marat Abdullin) #1341
* npm: Upgrade npm to 2.8.3. (Forrest L Norvell) #1448
* deps: upgrade openssl to 1.0.2a (Shigeki Ohtsu) #1389
* src: allow multiple arguments to be passed to
process.nextTick (Trevor Norris) #1077
* module: the interaction of require('.') with NODE_PATH has been
restored and deprecated. This functionality will be removed at
a later point. (Roman Reiss) #1363
| @@ -3,7 +3,7 @@ | |||
|
|
|||
| #define NODE_MAJOR_VERSION 1 | |||
| #define NODE_MINOR_VERSION 8 | |||
| #define NODE_PATCH_VERSION 0 | |||
| #define NODE_PATCH_VERSION 1 | |||
There was a problem hiding this comment.
We'll prefer v2.x's changes here.
|
R=@rvagg or @Fishrock123 |
|
LGTM |
chrisdickinson
added a commit
that referenced
this pull request
Apr 21, 2015
This brings in the '%PYTHON%' revert, and restores the correct NODE_MODULE_VERSION. PR-URL: #1482 Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
|
Merged in 59a5c98. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This merges the changes from v1.8.1 into master (the v2.0.0 candidate).