From df4dc54374a1b57987a2f935487d17af55cb61dc Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 18 Apr 2019 19:13:13 +0200 Subject: [PATCH] bump docker/swarmkit 59163bf75df38489d4a10392265d27156dc473c5 full diff: https://github.com/docker/swarmkit/compare/18e7e58ea1a5ec016625a636d0d52500eea123bc...59163bf75df38489d4a10392265d27156dc473c5 - Add missing return when configuring VXLAN port - Prevent possible panic in cnmallocator.IsAttachmentAllocated() - update github.com/pivotal-golang/clock - new name for package: code.cloudfoundry.org/clock Signed-off-by: Sebastiaan van Stijn --- vendor.conf | 2 +- vendor/github.com/docker/swarmkit/vendor.conf | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/vendor.conf b/vendor.conf index 9c3a80f2d9..bf2c5ccfb8 100755 --- a/vendor.conf +++ b/vendor.conf @@ -23,7 +23,7 @@ github.com/docker/go-metrics d466d4f6fd960e01820085bd7e1a github.com/docker/go-units 47565b4f722fb6ceae66b95f853feed578a4a51c # v0.3.3 github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a github.com/docker/licensing 9781369abdb5281cdc07a2a446c6df01347ec793 -github.com/docker/swarmkit 18e7e58ea1a5ec016625a636d0d52500eea123bc +github.com/docker/swarmkit 59163bf75df38489d4a10392265d27156dc473c5 github.com/evanphx/json-patch 72bf35d0ff611848c1dc9df0f976c81192392fa5 # v4.1.0 github.com/gofrs/flock 7f43ea2e6a643ad441fc12d0ecc0d3388b300c53 # v0.7.0 github.com/gogo/googleapis 08a7655d27152912db7aaf4f983275eaf8d128ef diff --git a/vendor/github.com/docker/swarmkit/vendor.conf b/vendor/github.com/docker/swarmkit/vendor.conf index 3a2c8f729a..c55f29c04e 100644 --- a/vendor/github.com/docker/swarmkit/vendor.conf +++ b/vendor/github.com/docker/swarmkit/vendor.conf @@ -8,7 +8,7 @@ # In >=1.11, those errors were brought back but the string had changed again. # After updating GRPC, if integration test failures occur, verify that the # string matching there is correct. -google.golang.org/grpc v1.12.0 +google.golang.org/grpc 7a6a684ca69eb4cae85ad0a484f2e531598c047b # v1.12.2 github.com/gogo/protobuf v1.0.0 github.com/golang/protobuf v1.1.0 github.com/matttproud/golang_protobuf_extensions v1.0.0 @@ -39,7 +39,7 @@ github.com/opencontainers/go-digest v1.0.0-rc1 github.com/opencontainers/image-spec v1.0.1 github.com/ishidawataru/sctp 07191f837fedd2f13d1ec7b5f885f0f3ec54b1cb -github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76 # v1.1.0 +github.com/davecgh/go-spew 8991bc29aa16c548c550c7ff78260e27b9ab7c73 # v1.1.1 github.com/Microsoft/go-winio v0.4.11 github.com/sirupsen/logrus v1.0.6 github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceaf @@ -52,15 +52,15 @@ github.com/hashicorp/go-memdb cb9a474f84cc5e41b273b20c6927680b2a8776ad github.com/hashicorp/golang-lru 0fb14efe8c47ae851c0034ed7a448854d3d34cf3 github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 github.com/phayes/permbits f7e3ac5e859d0b919c5068d581cc4c5d4f4f9bc5 -github.com/pivotal-golang/clock 3fd3c1944c59d9742e1cd333672181cd1a6f9fa0 +code.cloudfoundry.org/clock 02e53af36e6c978af692887ed449b74026d76fec github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d -github.com/pmezard/go-difflib 792786c7400a136282c1664665ae0a8db921c6c2 +github.com/pmezard/go-difflib 792786c7400a136282c1664665ae0a8db921c6c2 # v1.0.0 github.com/rcrowley/go-metrics 51425a2415d21afadfd55cd93432c0bc69e9598d github.com/spf13/cobra 8e91712f174ced10270cf66615e0a9127e7c4de5 github.com/spf13/pflag 7f60f83a2c81bc3c3c0d5297f61ddfa68da9d3b7 -github.com/stretchr/testify v1.1.4 +github.com/stretchr/testify ffdc059bfe9ce6a4e144ba849dbedead332c6053 # v1.3.0 go.etcd.io/bbolt v1.3.1-etcd.8 -golang.org/x/crypto 0709b304e793a5edb4a2c0145f281ecdc20838a4 +golang.org/x/crypto b7391e95e576cacdcdd422573063bc057239113d golang.org/x/net a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1 golang.org/x/sys 90868a75fefd03942536221d7c0e2f84ec62a668 golang.org/x/text f21a4dfb5e38f5895301dc265a8def02365cc3d0 # v0.3.0