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

Fix for zookeeper backend #462

Merged
merged 1 commit into from
Sep 17, 2015
Merged

Fix for zookeeper backend #462

merged 1 commit into from
Sep 17, 2015

Conversation

chenchun
Copy link
Contributor

Signed-off-by: Chun Chen ramichen@tencent.com

For both etcd and zookeeper, it's not allowed to watch a not exist node.
Tested on my laptop. Please don't review until docker/libkv#41 get's in.

@mavenugo
Copy link
Contributor

@chenchun thanks for the fix. Can you pls take care of the circleci failure ?

@abronan
Copy link

abronan commented Sep 8, 2015

@chenchun Sorry for the time spent reviewing your PR on libkv's side. Needs a rebase here :(

@chenchun
Copy link
Contributor Author

@abronan thanks, I'll rebase after #466 getting merged cause this PR will introduce Godeps changes of libkv which conflicts with that in #466.

@mavenugo
Copy link
Contributor

@chenchun now that we have the latest libkv, can u pls rebase ?

@chenchun
Copy link
Contributor Author

@mavenugo , rebased.
Found a issue with CI. I actually rebased my PR yesterday, but I forgot to git fetch origin first. So my PR didn't include libkv updates and it failed. I am wondering is it expected that CI tests again PR branch instead of master branch with changes in PR?

@mrjana
Copy link
Contributor

mrjana commented Sep 17, 2015

@chenchun CI cannot check against master since it may not be possible to merge without conflict all the time. So it always checks the PR version. That is why in a fast changing project like libnetwork it is always a good idea to rebase to the latest even if github didn't find any merge conflicts.

@chenchun
Copy link
Contributor Author

@mrjana ok, I see. Even if CI checks against master, PR can still be out dated with new patches merged into master. I'm overthinking.

@@ -88,3 +88,6 @@ coveralls:
circle-ci:
@${cidocker} make install-deps build-local check-local coveralls
make integration-tests

start-services:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to update the .PHONY target line above with this target Otherwise it is going to create an empty file calleed start-services in the root directory.

Signed-off-by: Chun Chen <ramichen@tencent.com>
@mrjana
Copy link
Contributor

mrjana commented Sep 17, 2015

@chenchun Thanks for taking care of the comments. LGTM

@mavenugo
Copy link
Contributor

👍

mavenugo added a commit that referenced this pull request Sep 17, 2015
@mavenugo mavenugo merged commit b85c321 into moby:master Sep 17, 2015
@chenchun chenchun deleted the data_store branch September 17, 2015 10:23
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.

4 participants