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

Update convergance #7

Merged
merged 3 commits into from
May 15, 2015

Conversation

Fishrock123
Copy link
Contributor

R=@jasnell

I'll rebase master ontop of c58264e once accepted.

jasnell and others added 2 commits May 1, 2015 08:24
Update the repository README file to accurately reflect
the intent and nature of this repository. The original
io.js README is preserved as iojs_README.md.

This is temporary just while the convergence process
gets underway. Once the repository moves over to
the official organization, this can be reverted back to
an actual project README that accurately reflects the
combined projects.

Reviewed-By: @jasnell James M Snell <[email protected]>
Reviewed-By: @Fishrock123 Jeremiah Senkpiel
PR-URL: nodejs/node-convergence-archive#4
Conflicts:
	README.md
@Fishrock123
Copy link
Contributor Author

CI: https://jenkins-iojs.nodesource.com/view/iojs/job/iojs+any-pr+multi/671/

(Currently not perfect, there's a fix for one issue coming soon and the windows issues may be jenkins-related.)

@jasnell
Copy link
Member

jasnell commented May 13, 2015

LGTM at this point modulo the additional issue and the resolution on the windows issue.

Conflicts:
	README.md
@Fishrock123
Copy link
Contributor Author

Updated. CI at this point now looks like: https://jenkins-iojs.nodesource.com/view/iojs/job/iojs+any-pr+multi/676/

@Fishrock123
Copy link
Contributor Author

(Still need to CI-bisect the windows things.)

@jasnell
Copy link
Member

jasnell commented May 14, 2015

Ok, looking at the CI, things look good except for the windows bits obviously. @Fishrock123, what's the status on those? I'm comfortable landing this with those red but it would good to get those working.

@Fishrock123
Copy link
Contributor Author

It appears to be jenkins trolling us: nodejs/node#1679 (comment)

If you have a windows machine you could try it, but it'l almost certainly pass locally. (unless one of the lingering rarely-pops-up failures hits)

Edit: specifically, you may rarely see nodejs/node#1100

@jasnell
Copy link
Member

jasnell commented May 14, 2015

👍

@Fishrock123 Fishrock123 merged commit 8e6bd77 into nodejs:master-with-merges May 15, 2015
@Fishrock123
Copy link
Contributor Author

Used git push convergence +HEAD:master-with-merges will fix local setup later.

@jasnell
Copy link
Member

jasnell commented May 15, 2015

👍

@Fishrock123
Copy link
Contributor Author

Also pushed the rebase version to master. or.. I thought I did. That version doesn't have the readme commit now? I have it locally. Fixing. Fixed.

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

Successfully merging this pull request may close these issues.

2 participants