Merge pull request moby#29292 from yongtang/12092016-swarmkit-update

Update vendored swarmkit to 5a6df4b
vboulineau · Dec 10, 2016 · b1322e3 · b1322e3
2 parents f7897af + 3c1c992
commit b1322e3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/vendor.conf b/vendor.conf
@@ -100,7 +100,7 @@ github.com/docker/containerd 03e5862ec0d8d3b3f750e19fca3ee367e13c090e
 github.com/tonistiigi/fifo 1405643975692217d6720f8b54aeee1bf2cd5cf4
 
 # cluster
-github.com/docker/swarmkit 5fe1f720da9c8ee66b49907d6ee415e9bfb1e5ef
+github.com/docker/swarmkit 5a6df4b07d83e6dbd72e39e354c325dc9b91850f
 github.com/golang/mock bd3c8e81be01eef76d4b503f5e687d2d1354d2d9
 github.com/gogo/protobuf v0.3
 github.com/cloudflare/cfssl 7fb22c8cba7ecaf98e4082d22d65800cf45e042a

diff --git a/vendor/github.com/docker/swarmkit/manager/allocator/networkallocator/networkallocator.go b/vendor/github.com/docker/swarmkit/manager/allocator/networkallocator/networkallocator.go