Merge v1.x into next, upgrade v8 - #1399
Merged
bnoordhuis merged 10 commits intoApr 16, 2015
Merged
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
This commit makes `os.tmpdir()` behave consistently on all platforms. It changes `os.tmpdir()` to always return a path without trailing slash. Semver: major Fixes: nodejs#715 PR-URL: nodejs#747 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
This commit applies some secondary changes in order to make `make test` pass cleanly: * disable broken postmortem debugging in common.gypi * drop obsolete strict mode test in parallel/test-repl * drop obsolete test parallel/test-v8-features PR-URL: nodejs#1232 Reviewed-By: Fedor Indutny <fedor@indutny.com>
Cherry-pick https://codereview.chromium.org/1033733003 from upstream and re-enable postmortem debugging. PR-URL: nodejs#1232 Reviewed-By: Fedor Indutny <fedor@indutny.com>
Conflicts: deps/v8/AUTHORS deps/v8/include/v8-version.h
Conflicts: deps/v8/include/v8-version.h src/node_version.h
Conflicts: src/node_version.h
Copy link
Copy Markdown
Contributor
|
LGTM on the 1.6.3 & 1.6.4 updates, can't really comment on v8 tho. |
Sorry, something went wrong.
Copy link
Copy Markdown
Member
|
LGTM, if it works... Its hard to validate the merge. |
Sorry, something went wrong.
This includes the out-of-tree patch (but fixed in upstream HEAD) from commit 41c00a2 ("deps: enable v8 postmortem debugging again".) PR-URL: nodejs#1399 Reviewed-By: Fedor Indutny <fedor@indutny.com>
Conflicts: src/node_version.h
Conflicts: src/node_version.h
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Merge v1.6.3 and v1.6.4 into next and update V8 to 4.2.77.15 (from 4.2.77.13.)
R=@indutny?
https://jenkins-iojs.nodesource.com/view/iojs/job/iojs+any-pr+multi/491/