Skip to content
This repository was archived by the owner on Feb 1, 2021. It is now read-only.

use docker/docker/pkg/discovery and update godeps#1601

Merged
abronan merged 4 commits intodocker-archive:masterfrom
vieux:docker_discovery
Jan 13, 2016
Merged

use docker/docker/pkg/discovery and update godeps#1601
abronan merged 4 commits intodocker-archive:masterfrom
vieux:docker_discovery

Conversation

@vieux
Copy link
Copy Markdown
Contributor

@vieux vieux commented Jan 11, 2016

Related to #1594

I had to update godeps at the same time,
that's why the PR can look big, but you can just review the 1st commit.

Since it's going to go away soon, I left token in docker/swarm it's better not to add something in engine to remove it one version later.

@vieux
Copy link
Copy Markdown
Contributor Author

vieux commented Jan 11, 2016

ping @dongluochen @abronan

@dongluochen
Copy link
Copy Markdown
Contributor

LGTM.

@vieux vieux changed the title use docker/docker/pkg/discovery use docker/docker/pkg/discovery and update godeps Jan 11, 2016
Mary Anthony and others added 4 commits January 12, 2016 00:34
Signed-off-by: Mary Anthony <mary@docker.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
@abronan
Copy link
Copy Markdown
Contributor

abronan commented Jan 13, 2016

LGTM

thanks @vieux! 😉

abronan added a commit that referenced this pull request Jan 13, 2016
use docker/docker/pkg/discovery and update godeps
@abronan abronan merged commit 254e095 into docker-archive:master Jan 13, 2016
@vieux vieux deleted the docker_discovery branch January 13, 2016 01:06
ChristianKniep pushed a commit to ChristianKniep/swarm that referenced this pull request Jul 27, 2017
use docker/docker/pkg/discovery and update godeps
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants