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.

Sign up for GitHub

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

Jump to bottom

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

Commits on Mar 21, 2015

  1. Working on v2.0.0

    @bnoordhuis
    bnoordhuis committed Mar 21, 2015
    Configuration menu
    Copy the full SHA
    bc1fe3a View commit details
    Browse the repository at this point in the history

  2. os: remove trailing slash from os.tmpdir() 

    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]>
    @tellnes
    tellnes committed Mar 21, 2015
    Configuration menu
    Copy the full SHA
    bb97b70 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2015

  1. deps: upgrade v8 to 4.2.77.13 

    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]>
    @bnoordhuis
    bnoordhuis committed Mar 27, 2015
    Configuration menu
    Copy the full SHA
    336dc08 View commit details
    Browse the repository at this point in the history

  2. deps: enable v8 postmortem debugging again 

    Cherry-pick https://codereview.chromium.org/1033733003 from upstream
and re-enable postmortem debugging.

PR-URL: nodejs#1232
Reviewed-By: Fedor Indutny <[email protected]>
    @bnoordhuis
    bnoordhuis committed Mar 27, 2015
    Configuration menu
    Copy the full SHA
    41c00a2 View commit details
    Browse the repository at this point in the history

  3. Merge tag 'v1.6.2' into next 

    Conflicts:
	deps/v8/AUTHORS
	deps/v8/include/v8-version.h
    @bnoordhuis
    bnoordhuis committed Mar 27, 2015
    Configuration menu
    Copy the full SHA
    38225a7 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2015

  1. Merge tag 'v1.6.3' into next 

    Conflicts:
	deps/v8/include/v8-version.h
	src/node_version.h
    @bnoordhuis
    bnoordhuis committed Apr 11, 2015
    Configuration menu
    Copy the full SHA
    bcb4192 View commit details
    Browse the repository at this point in the history

  2. Merge tag 'v1.6.4' into next 

    Conflicts:
	src/node_version.h
    @bnoordhuis
    bnoordhuis committed Apr 11, 2015
    Configuration menu
    Copy the full SHA
    d6ab370 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2015

  1. deps: upgrade v8 to 4.2.77.15 

    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]>
    @bnoordhuis
    bnoordhuis committed Apr 16, 2015
    Configuration menu
    Copy the full SHA
    767a5c6 View commit details
    Browse the repository at this point in the history

  2. Merge tag 'v1.7.0' into next 

    Conflicts:
	src/node_version.h
    @bnoordhuis
    bnoordhuis committed Apr 16, 2015
    Configuration menu
    Copy the full SHA
    d047e04 View commit details
    Browse the repository at this point in the history

  3. Merge tag 'v1.7.1' into next 

    Conflicts:
	src/node_version.h
    @bnoordhuis
    bnoordhuis committed Apr 16, 2015
    Configuration menu
    Copy the full SHA
    5e7a3f7 View commit details
    Browse the repository at this point in the history