cherry-pick missing commits from master #1444
Merged
Conversation
This file contains 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
|
Rubber stamp LGTM, based on them landing before. Might want to run the CI. |
|
Auto-CI running at https://jenkins-iojs.nodesource.com/view/iojs/job/iojs+any-pr+multi/523/ |
|
|
|
Updated – this LGTM. |
PR-URL: nodejs#1444 Reviewed-By: Trevor Norris <trev.norris@gmail.com> Reviewed-By: Chris Dickinson <christopher.s.dickinson@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Like libuv does. Originally: node-forward/node#21 PR-URL: nodejs#1444 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com> Conflicts: vcbuild.bat
Fishrock123
force-pushed
the
cherrypick-master
branch
from
16cfa54
to
91943a9
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Context for posterity:
masterwas not originally the development branch, and essentially had out-of-branch patches.These two were relevant to merge into the active branch (v1.x) before re-creating
masterfrom v1.xSee: #1436 (comment)