Merge pull request moby#28728 from aluzzardi/swarmkit-revendor-53fcde…

…ba083627b1a2616612a103019b73c6d5ce revendor swarmkit to 53fcdeb
bemile · Nov 23, 2016 · 1640bb2 · 1640bb2
2 parents 2c978bd + 5124718
commit 1640bb2
Show file tree

Hide file tree

Showing 14 changed files with 245 additions and 266 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 9bca23b0de42a9ebcc71622a30d646afa1e2b564
+github.com/docker/swarmkit 53fcdeba083627b1a2616612a103019b73c6d5ce 
 github.com/golang/mock bd3c8e81be01eef76d4b503f5e687d2d1354d2d9
 github.com/gogo/protobuf v0.3
 github.com/cloudflare/cfssl 7fb22c8cba7ecaf98e4082d22d65800cf45e042a

diff --git a/vendor/github.com/docker/swarmkit/agent/exec/controller_test.mock.go b/vendor/github.com/docker/swarmkit/agent/exec/controller_test.mock.go
diff --git a/vendor/github.com/docker/swarmkit/api/ca.pb.go b/vendor/github.com/docker/swarmkit/api/ca.pb.go
diff --git a/vendor/github.com/docker/swarmkit/api/ca.proto b/vendor/github.com/docker/swarmkit/api/ca.proto