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

cherry-pick missing commits from master #1444

Merged
merged 2 commits into from
Apr 16, 2015

Conversation

Fishrock123
Copy link
Contributor

Context for posterity:
master was 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 master from v1.x


See: #1436 (comment)

@cjihrig
Copy link
Contributor

cjihrig commented Apr 16, 2015

Rubber stamp LGTM, based on them landing before. Might want to run the CI.

@Fishrock123
Copy link
Contributor Author

@chrisdickinson
Copy link
Contributor

Errr, let's not cherry pick these, please. Okay, this is good to go. We just need to make sure we reset master down to 3a9754a.

@chrisdickinson
Copy link
Contributor

Updated – this LGTM.

yorkie and others added 2 commits April 16, 2015 19:26
PR-URL: nodejs#1444
Reviewed-By: Trevor Norris <[email protected]>
Reviewed-By: Chris Dickinson <[email protected]>
Reviewed-By: Jeremiah Senkpiel <[email protected]>
Like libuv does.

Originally: node-forward/node#21

PR-URL: nodejs#1444
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Jeremiah Senkpiel <[email protected]>

Conflicts:
	vcbuild.bat
@Fishrock123 Fishrock123 merged commit 91943a9 into nodejs:v1.x Apr 16, 2015
@Fishrock123
Copy link
Contributor Author

Landed in 51d0808 & 91943a9 - cheers.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants