Skip to content
This repository has been archived by the owner on Oct 15, 2020. It is now read-only.

Commit

Permalink
meta: merge node/master into node-chakracore/master
Browse files Browse the repository at this point in the history 
Merge 26ce1ae as of 2018-01-31
This commit was automatically generated. For any problems, please contact jackhorton

Reviewed-By: Jimmy Thomson <jithomso@microsoft.com>

Conflicts:
	src/node_contextify.cc
  • Loading branch information
@MSLaguana
MSLaguana committed Feb 9, 2018
2 parents 4a4520e + 26ce1ae commit 47d5430
Show file tree
Hide file tree
Showing 39 changed files with 2,178 additions and 795 deletions.
22 changes: 13 additions & 9 deletions COLLABORATOR_GUIDE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,10 @@ Node.js uses three Deprecation levels:
being staged for deprecation in a future Node.js major release. An explicit
notice indicating the deprecated status is added to the API documentation
but no functional changes are implemented in the code. There will be no
runtime deprecation warnings emitted for such deprecations.
runtime deprecation warnings emitted for such deprecations by default.
Documentation-only deprecations may trigger a runtime warning when launched
with [`--pending-deprecation`][] flag (or its alternative,
`NODE_PENDING_DEPRECATION=1` environment variable).

* *Runtime Deprecation* refers to the use of process warnings emitted at
runtime the first time that a deprecated API is used. A command-line
Expand Down Expand Up @@ -593,20 +596,20 @@ Validate that the commit message is properly formatted using
$ git rev-list upstream/master...HEAD | xargs core-validate-commit
```

Optional: When landing your own commits, force push the amended commit to the
branch you used to open the pull request. If your branch is called `bugfix`,
then the command would be `git push --force-with-lease origin master:bugfix`.
When the pull request is closed, this will cause the pull request to
show the purple merged status rather than the red closed status that is
usually used for pull requests that weren't merged.

Time to push it:

```text
$ git push upstream master
```
* Optional: Force push the amended commit to the branch you used to
open the pull request. If your branch is called `bugfix`, then the
command would be `git push --force-with-lease origin master:bugfix`.
When the pull request is closed, this will cause the pull request to
show the purple merged status rather than the red closed status that is
usually used for pull requests that weren't merged. Only do this when
landing your own contributions.

* Close the pull request with a "Landed in `<commit hash>`" comment. If
Close the pull request with a "Landed in `<commit hash>`" comment. If
your pull request shows the purple merged status then you should still
add the "Landed in <commit hash>..<commit hash>" comment if you added
multiple commits.
Expand Down Expand Up @@ -744,6 +747,7 @@ LTS working group and the Release team.
[backporting guide]: doc/guides/backporting-to-release-lines.md
[Stability Index]: doc/api/documentation.md#stability-index
[Enhancement Proposal]: https://github.com/nodejs/node-eps
[`--pending-deprecation`]: doc/api/cli.md#--pending-deprecation
[git-username]: https://help.github.com/articles/setting-your-username-in-git/
[`node-core-utils`]: https://github.com/nodejs/node-core-utils
[TSC]: https://github.com/nodejs/TSC
1 change: 1 addition & 0 deletions deps/v8/test/inspector/debugger/async-stack-for-promise-expected.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,4 @@ foo1 (test.js:9:2)
-- Promise.finally --
finally2 (test.js:225:34)
(anonymous) (testFinally2.js:0:0)

4 changes: 2 additions & 2 deletions deps/v8/test/inspector/debugger/external-stack-trace-expected.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ Running test: testInstrumentation
callFrames : [
[0] : {
columnNumber : 15
functionName :
functionName :
lineNumber : 0
scriptId : <scriptId>
url :
url :
}
]
description : stack
Expand Down
1 change: 1 addition & 0 deletions deps/v8/test/inspector/debugger/pause-on-async-call-expected.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,3 +205,4 @@ paused at:
debugger;
createPromise().then(#v => v * 2);
}

84 changes: 42 additions & 42 deletions deps/v8/test/inspector/debugger/promise-chain-when-limit-hit-expected.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 2
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
Expand All @@ -36,7 +36,7 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
Expand All @@ -54,14 +54,14 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
functionName : Promise.resolve.then
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
]
description : Promise.then
Expand All @@ -72,14 +72,14 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 4
functionName :
functionName :
lineNumber : 6
scriptId : <scriptId>
url :
url :
}
]
description : Promise.then
Expand Down Expand Up @@ -110,7 +110,7 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 2
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
Expand All @@ -127,7 +127,7 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
Expand All @@ -145,14 +145,14 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
functionName : Promise.resolve.then
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
]
description : Promise.then
Expand All @@ -163,14 +163,14 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 4
functionName :
functionName :
lineNumber : 6
scriptId : <scriptId>
url :
url :
}
]
description : Promise.then
Expand Down Expand Up @@ -201,7 +201,7 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 2
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
Expand All @@ -218,7 +218,7 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
Expand All @@ -236,14 +236,14 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
functionName : Promise.resolve.then
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
]
description : Promise.then
Expand All @@ -254,14 +254,14 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 4
functionName :
functionName :
lineNumber : 6
scriptId : <scriptId>
url :
url :
}
]
description : Promise.then
Expand Down Expand Up @@ -292,7 +292,7 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 2
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
Expand All @@ -309,7 +309,7 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
Expand All @@ -327,14 +327,14 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
functionName : Promise.resolve.then
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
]
description : Promise.then
Expand All @@ -345,14 +345,14 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 4
functionName :
functionName :
lineNumber : 6
scriptId : <scriptId>
url :
url :
}
]
description : Promise.then
Expand Down Expand Up @@ -383,7 +383,7 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 2
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
Expand All @@ -400,7 +400,7 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
Expand All @@ -418,14 +418,14 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
functionName : Promise.resolve.then
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
]
description : Promise.then
Expand All @@ -436,14 +436,14 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 4
functionName :
functionName :
lineNumber : 6
scriptId : <scriptId>
url :
url :
}
]
description : Promise.then
Expand Down Expand Up @@ -474,7 +474,7 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 2
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
Expand All @@ -491,7 +491,7 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
Expand All @@ -509,14 +509,14 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 33
functionName : Promise.resolve.then
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
]
description : Promise.then
Expand All @@ -527,14 +527,14 @@ Run expression 'console.trace()' with async chain len: 3
functionName : asyncCall
lineNumber : 5
scriptId : <scriptId>
url :
url :
}
[1] : {
columnNumber : 4
functionName :
functionName :
lineNumber : 6
scriptId : <scriptId>
url :
url :
}
]
description : Promise.then
Expand Down
1 change: 1 addition & 0 deletions deps/v8/test/inspector/debugger/this-in-arrow-function-expected.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,4 @@ This in evaluateOnCallFrame:
type : object
}
Values equal: false

1 change: 1 addition & 0 deletions deps/v8/test/message/fail/console.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ Error: exception
at Object.toString (*%(basename)s:24:39)
at console.info (<anonymous>)
at *%(basename)s:24:9

Loading

0 comments on commit 47d5430

Please sign in to comment.