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

Update hppc to 0.7.1 to match TP3's dependency on hppc #1127

Closed
wants to merge 1 commit into from

Conversation

jkschneider
Copy link

HPPC introduced a breaking change to Titan with this commit: carrotsearch/hppc@3fe735b

Latest version conflict resolution in Gradle and Ivy cause Titan 0.9 M2 and Tinkerpop 3.0.0-incubating to be incompatible because of TP3's dependency on HPPC 0.7.1

Also contained in this PR is a change in Tinkerpop's version from 3.0.0-SNAPSHOT to 3.0.0-incubating now that it has been released.

@dalaro
Copy link
Member

dalaro commented Aug 28, 2015

titan09 got the 3.0.0-incubating change from some other commit a while back. The rest of this PR looks like #1125. Both are conflicted by now. It ended up being fastest to rerun the find-replaces to remove "Open" than to try resolving the conflicts in this particular case (9a49faa).

@dalaro dalaro closed this Aug 28, 2015
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.

2 participants