Merge pull request #269 from nkubala/deps

Fix docker dep overrides
GoogleContainerTools · Oct 30, 2018 · 5438e03 · 5438e03
2 parents fccfba7 + d00973d
commit 5438e03
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 30 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -13,11 +13,11 @@
 
 [[override]]	
   name = "github.com/docker/distribution"	
-  revision = "83389a148052d74ac602f5f1d62f86ff2f3c4aa5"
+  revision = "master"
 
 [[override]]
   name = "github.com/docker/libnetwork"
-  revision = "19279f0492417475b6bfbd0aa529f73e8f178fb5"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/nightlyone/lockfile"

diff --git a/vendor/github.com/docker/libnetwork/ipamutils/utils.go b/vendor/github.com/docker/libnetwork/ipamutils/utils.go