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

cherry-pick missing commits from master #1444

Merged
merged 2 commits into from
Apr 16, 2015
Merged

cherry-pick missing commits from master #1444

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)

@Fishrock123 Fishrock123 mentioned this pull request Apr 16, 2015
Closed
@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

Auto-CI running at https://jenkins-iojs.nodesource.com/view/iojs/job/iojs+any-pr+multi/523/

@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
@yorkie @Fishrock123
stream: remove duplicated expression
51d0808 
PR-URL: nodejs#1444
Reviewed-By: Trevor Norris <[email protected]>
Reviewed-By: Chris Dickinson <[email protected]>
Reviewed-By: Jeremiah Senkpiel <[email protected]>
@rvagg @Fishrock123
build: use %PYTHON% instead of python
91943a9 
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.

@Fishrock123 Fishrock123 deleted the cherrypick-master branch May 12, 2015 22:32
@snyk-bot snyk-bot mentioned this pull request Aug 11, 2020
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Fishrock123 @cjihrig @chrisdickinson @yorkie @rvagg