From bea7b88e4b4396b5d2aec9848f4c1a49d174fa31 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 29 Nov 2017 15:54:49 -0800 Subject: [PATCH] Override github.com/docker/docker in vendor.conf Signed-off-by: Sebastiaan van Stijn --- components/cli/vendor.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/cli/vendor.conf b/components/cli/vendor.conf index a681cf8ade..a6cd268af2 100755 --- a/components/cli/vendor.conf +++ b/components/cli/vendor.conf @@ -4,7 +4,9 @@ github.com/coreos/etcd 824277cb3a577a0e8c829ca9ec557b973fe06d20 github.com/cpuguy83/go-md2man a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76 github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c -github.com/docker/docker 84144a8c66c1bb2af8fa997288f51ef2719971b4 + +# github.com/docker/docker has https://github.com/moby/moby/pull/35008/commits/4b6ec10b07c14e7fff1cc51156b6d954147f826f applied +#github.com/docker/docker 84144a8c66c1bb2af8fa997288f51ef2719971b4 github.com/docker/docker-credential-helpers v0.5.1 # the docker/go package contains a customized version of canonical/json