Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge v1.8.1 #1482

Merged
merged 4 commits into from
Apr 21, 2015
Merged

Merge v1.8.1 #1482

merged 4 commits into from
Apr 21, 2015

Conversation

chrisdickinson
Copy link
Contributor

This merges the changes from v1.8.1 into master (the v2.0.0 candidate).

chrisdickinson and others added 4 commits April 17, 2015 14:53
This reverts commit 91943a9.

Old commit cherry-picked in but found to cause problems with .msi
creation on Windows.
Original change is mostly pointless because V8 hard-wires
`python` anyway.

PR-URL: #1475
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
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
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll prefer v2.x's changes here.

@chrisdickinson
Copy link
Contributor Author

R=@rvagg or @Fishrock123

@Fishrock123
Copy link
Member

LGTM

@chrisdickinson chrisdickinson merged commit 7b7da2e into nodejs:master Apr 21, 2015
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>
@chrisdickinson
Copy link
Contributor Author

Merged in 59a5c98.

@rvagg rvagg mentioned this pull request Apr 27, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants