Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 87a7a64

Browse files
andrewhsuandrewhsu
authored
Merge pull request #165 from andrewhsu/ln2
re-vndr engine's libnetwork to bump_17.06.0 again
2 parents 9b2a406 + 2a1db02 commit 87a7a64

File tree

8 files changed

+48
-129
lines changed

8 files changed

+48
-129
lines changed

‎components/cli/vendor/github.com/docker/docker/vendor.conf‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/engine/vendor.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ github.com/imdario/mergo 0.2.1
2727
golang.org/x/sync de49d9dcd27d4f764488181bea099dfe6179bcf0
2828

2929
#get libnetwork packages
30-
github.com/docker/libnetwork f0b9939b255aa2d2be3ec03d478a0c5e030ee07e
30+
github.com/docker/libnetwork 0605cbcf31e36c2606461151f66b4e30695637a6
3131
github.com/docker/go-events 18b43f1bc85d9cdd42c05a6cd2d444c7a200a894
3232
github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80
3333
github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec

‎components/engine/vendor/github.com/docker/libnetwork/common/caller.go‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/joinleave.go‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ov_network.go‎

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ov_serf.go‎

Lines changed: 8 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/overlay.go‎

Lines changed: 3 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/peerdb.go‎

Lines changed: 28 additions & 74 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)