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

The conquest of El Cid, Pt. 2 #3290

Merged
merged 1 commit into from
Oct 10, 2016
Merged

The conquest of El Cid, Pt. 2 #3290

merged 1 commit into from
Oct 10, 2016

Conversation

whyrusleeping
Copy link
Member

License: MIT
Signed-off-by: Jeromy why@ipfs.io

@whyrusleeping whyrusleeping added the status/in-progress In progress label Oct 7, 2016
@whyrusleeping
Copy link
Member Author

weird... for some reason the gx install is getting skipped on the osx sharness builds... uhhh

@whyrusleeping
Copy link
Member Author

Was a weird CI fluke. moving on.

@kevina
Copy link
Contributor

kevina commented Oct 7, 2016

@whyrusleeping I just know that once this is merged it going to create another round of not so nice conflicts for me to resolve in #2634 🙁

@whyrusleeping
Copy link
Member Author

@kevina it shouldnt be too bad. I can handle them if you like. The biggest thing to keep in mind is that you won't be able to compare keys/cids with == anymore. (theres a .Equals method).

License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
whyrusleeping referenced this pull request Oct 9, 2016
this redoes (again) 582e5de.

License: MIT
Signed-off-by: Kevin Atkinson <k@kevina.org>
@RichardLitt
Copy link
Member

@whyrusleeping I'm curious what this is, besides a ridiculously long epic poem about a Spaniard. What does Cid stand for, and why is it replacing multihash everywhere?

@whyrusleeping
Copy link
Member Author

@RichardLitt https://github.com/ipld/cid

@whyrusleeping whyrusleeping merged commit 7962903 into master Oct 10, 2016
@whyrusleeping whyrusleeping deleted the feat/el-cid-2 branch October 10, 2016 13:37
@whyrusleeping whyrusleeping removed the status/in-progress In progress label Oct 10, 2016
@ghost ghost mentioned this pull request Dec 23, 2016
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.

3 participants