Skip to content
This repository has been archived by the owner on Apr 7, 2020. It is now read-only.

Commit

Permalink
Re-vendor swarmkit to include the following fixes:
Browse files Browse the repository at this point in the history
- moby/swarmkit#2218
- moby/swarmkit#2215
- moby/swarmkit#2233

Signed-off-by: Ying <ying.li@docker.com>
  • Loading branch information
cyli authored and silvin-lubecki committed Mar 10, 2020
1 parent d771b4d commit cf1a2b4
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 44 deletions.
2 changes: 1 addition & 1 deletion vendor.conf
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ github.com/containerd/containerd cfb82a876ecc11b5ca0977d1733adbe58599088a
github.com/tonistiigi/fifo 1405643975692217d6720f8b54aeee1bf2cd5cf4

# cluster
github.com/docker/swarmkit 4b872cfac8ffc0cc7fff434902cc05dbc7612da5
github.com/docker/swarmkit 758b59114f7eef55faca7007af773d4097540ed2
github.com/gogo/protobuf v0.4
github.com/cloudflare/cfssl 7fb22c8cba7ecaf98e4082d22d65800cf45e042a
github.com/google/certificate-transparency d90e65c3a07988180c5b1ece71791c0b6506826e
Expand Down
6 changes: 3 additions & 3 deletions vendor/github.com/docker/swarmkit/ca/reconciler.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

80 changes: 41 additions & 39 deletions vendor/github.com/docker/swarmkit/manager/allocator/allocator.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit cf1a2b4

Please sign in to comment.