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

Migrate go-datastore to gx #2838

Merged
merged 7 commits into from
Jun 13, 2016
Merged

Migrate go-datastore to gx #2838

merged 7 commits into from
Jun 13, 2016

Conversation

Kubuxu
Copy link
Member

@Kubuxu Kubuxu commented Jun 11, 2016 •
edited
Loading

ipfs/go-datastore#5 should be reviewed and merged first.

@Kubuxu Kubuxu changed the title [WIP] Migrate go-datastore to gx Migrate go-datastore to gx Jun 11, 2016
@Kubuxu Kubuxu added the need/review Needs a review label Jun 11, 2016
@whyrusleeping
Copy link
Member

the docker tests were failing on travis for some reason. Rerunning to see if it was a fluke

@whyrusleeping
Copy link
Member

@Kubuxu hrm... travis tests still failing..

@Kubuxu
Copy link
Member Author

Kubuxu commented Jun 11, 2016 •
edited
Loading

@whyrusleeping: It is in docker, I have no idea what is going on but it is weird.
Go here: https://s3.amazonaws.com/archive.travis-ci.org/jobs/136932611/log.txt

and search for: QmV3NSS3A1kX5s28r7yLczhDsXzkgo65cqRgKFXYunWZmD from the bottom, this is cause of the failure.

@kevina
Copy link
Contributor

kevina commented Jun 11, 2016 •
edited
Loading

@whyrusleeping, @Kubuxu could you look at my pull requests I put on go-datastore and possible get those in before moving to gx. This way, I can avoid having to use my own version of go-datastore for pull request #2634.

@Kubuxu
Copy link
Member Author

Kubuxu commented Jun 11, 2016

@kevina from what I can see your changes are only very small, if it is possible just extract those changes atop https://github.com/ipfs/go-datastore and give me commites/branch.

@kevina
Copy link
Contributor

kevina commented Jun 11, 2016

As a clarification I am talking merging ipfs/go-datastore#2 and ipfs/go-datastore#3.

@Kubuxu Kubuxu force-pushed the feature/datastore-to-gx branch 2 times, most recently from c6158c7 to 7556a2e Compare June 11, 2016 22:58
@Kubuxu
Copy link
Member Author

Kubuxu commented Jun 11, 2016

@whyrusleeping it is green, the problem was that the package.json was including same package multiple times (I've messed up some rebases).

@whyrusleeping
Copy link
Member

@Kubuxu sorry, i merged a different PR first with package.json changes. gonna need a rebase :(

@Kubuxu
Remove go-datastore from Godeps
6217e1f 
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
@Kubuxu
Import go-datastore to gx
cafd81c 
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
@Kubuxu
Remove snappy from Godeps
7910c6e 
It is in go-datastore

License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
@Kubuxu
Move metrics to gx
6bd66cc 
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
@Kubuxu
Remove codahale/hdrhistogram as it is not longer used
58d222f 
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
@Kubuxu
Remove go-os-rename
35bb502 
It is included in go-datastore

License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
@Kubuxu
Copy link
Member Author

Kubuxu commented Jun 12, 2016

Resolved the conflict.

@Kubuxu
Move golang-lru to gx
a14bd71 
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
@whyrusleeping whyrusleeping merged commit 79e9bd8 into master Jun 13, 2016
@whyrusleeping whyrusleeping deleted the feature/datastore-to-gx branch June 13, 2016 02:56
ariescodescream pushed a commit to ariescodescream/go-ipfs that referenced this pull request Oct 23, 2021
@whyrusleeping
Merge pull request ipfs#2838 from ipfs/feature/datastore-to-gx
c2012aa 
Migrate go-datastore to gx
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
need/review Needs a review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Kubuxu @whyrusleeping @kevina