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.x into next, upgrade v8 #1399

Merged
merged 10 commits into from
Apr 16, 2015
Merged

Merge v1.x into next, upgrade v8 #1399

merged 10 commits into from
Apr 16, 2015

Conversation

bnoordhuis
Copy link
Member

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/

bnoordhuis and others added 7 commits March 21, 2015 14:37
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 <[email protected]>
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 <[email protected]>
Cherry-pick https://codereview.chromium.org/1033733003 from upstream
and re-enable postmortem debugging.

PR-URL: nodejs#1232
Reviewed-By: Fedor Indutny <[email protected]>
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
@mscdex mscdex added the meta Issues and PRs related to the general management of the project. label Apr 11, 2015
@Fishrock123
Copy link
Contributor

LGTM on the 1.6.3 & 1.6.4 updates, can't really comment on v8 tho.

@indutny
Copy link
Member

indutny commented Apr 13, 2015

LGTM, if it works... Its hard to validate the merge.

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 <[email protected]>
Conflicts:
	src/node_version.h
Conflicts:
	src/node_version.h
@bnoordhuis bnoordhuis merged commit 5e7a3f7 into nodejs:next Apr 16, 2015
@bnoordhuis bnoordhuis deleted the nexter branch April 16, 2015 11:53
bnoordhuis added a commit that referenced this pull request Apr 28, 2015
This includes the out-of-tree patch (but fixed in upstream HEAD) from
commit 41c00a2 ("deps: enable v8 postmortem debugging again".)

PR-URL: #1399
Reviewed-By: Fedor Indutny <[email protected]>
@rvagg rvagg mentioned this pull request Apr 29, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
meta Issues and PRs related to the general management of the project.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants