Merge pull request moby#579 from mavenugo/discovery_godep

Godep update required for Docker discovery integration
abronan · Sep 30, 2015 · 768e582 · 768e582
2 parents 70409ac + add4bbd
commit 768e582
Show file tree

Hide file tree

Showing 137 changed files with 5,655 additions and 3,383 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/discovery/README.md b/Godeps/_workspace/src/github.com/docker/docker/pkg/discovery/README.md
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/discovery/backends.go b/Godeps/_workspace/src/github.com/docker/docker/pkg/discovery/backends.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/discovery/discovery.go b/Godeps/_workspace/src/github.com/docker/docker/pkg/discovery/discovery.go