From f4b99aa7b6606da37b39fe9f2cae7458f8cfc22e Mon Sep 17 00:00:00 2001 From: Tobias Schottdorf Date: Fri, 16 Aug 2019 17:34:59 +0200 Subject: [PATCH] vendor: bump go.etcd.io/etcd/raft This picks up improvements related to joint consensus. We're pinning a SHA that is close to master but not quite there to avoid tickling to a bug in CRDB: https://github.com/cockroachdb/cockroach/issues/40207 Release note: None --- Gopkg.lock | 5 ++--- Gopkg.toml | 8 +++++++- vendor | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 4701d218e640..47334bff7ca4 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -1508,8 +1508,7 @@ revision = "b5bfa59ec0adc420475f97f89b58045c721d761c" [[projects]] - branch = "master" - digest = "1:7b2765d91bece066a1cb4928d8b39cce152a6a08602e13b1169648c2f200cfff" + digest = "1:a893ff8345b4fea61f22af749d8bbe6c546e9ed36b52bb80da25e991a884cc8e" name = "go.etcd.io/etcd" packages = [ "raft", @@ -1519,7 +1518,7 @@ "raft/tracker", ] pruneopts = "UT" - revision = "4a4629fd9f01d4e2669c4f537a56a0019d95617e" + revision = "9b29151d3072511f574e7272a5348504086013fa" [[projects]] digest = "1:3b5a3bc35810830ded5e26ef9516e933083a2380d8e57371fdfde3c70d7c6952" diff --git a/Gopkg.toml b/Gopkg.toml index 9143acf49e61..29d30086606b 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -38,7 +38,13 @@ ignored = [ [[constraint]] name = "go.etcd.io/etcd" - branch = "master" + # We're stopping just shy of 4a2b4c8f7e0a3754fdd5a3341a27c2431c2a5385 + # which picks up a fix to an inefficiency that at the time of writing + # triggers a bug: + # https://github.com/cockroachdb/cockroach/issues/40207 + # + # branch = "master" + revision = "9b29151d3072511f574e7272a5348504086013fa" # Used for the API client; we want the latest. [[constraint]] diff --git a/vendor b/vendor index 32b7d49bdc5e..ce3756cc233f 160000 --- a/vendor +++ b/vendor @@ -1 +1 @@ -Subproject commit 32b7d49bdc5ec4e25b11c096254fa5dbf9025738 +Subproject commit ce3756cc233fdf3810025c7cce6d5d137f13918e