Merge pull request deis#4118 from Joshua-Anderson/update-vendored-docker

chore(tests): update vendored docker code to 1.5.0
yumok · Jul 29, 2015 · be8c7b9 · be8c7b9
2 parents 54b4537 + 8c4b3ec
commit be8c7b9
Show file tree

Hide file tree

Showing 203 changed files with 11,481 additions and 3,613 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/docker/docker/api/MAINTAINERS b/Godeps/_workspace/src/github.com/docker/docker/api/MAINTAINERS
diff --git a/Godeps/_workspace/src/github.com/docker/docker/api/client/cli.go b/Godeps/_workspace/src/github.com/docker/docker/api/client/cli.go