Merge #24889

24889: cherrypick-1.1: build: Update etcd r=bdarnell a=bdarnell Picks up a cherry-picked version of etcd-io/etcd#9073, to fix #18601 Release note (bug fix): Fixes potential cluster unavailability after raft logs grow too large. Co-authored-by: Ben Darnell <[email protected]>
cockroachdb · Apr 19, 2018 · fc0e2d1 · fc0e2d1
2 parents 1f56097 + 54819a3
commit fc0e2d1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -51,7 +51,8 @@ ignored = [
 
 [[constraint]]
   name = "github.com/coreos/etcd"
-  branch = "master"
+  source = "https://github.com/cockroachdb/etcd"
+  branch = "crdb-release-1.1"
 
 [[constraint]]
   name = "github.com/rlmcpherson/s3gof3r"

diff --git a/vendor b/vendor
+0 −2		github.com/coreos/etcd/raft/node.go
+5 −1		github.com/coreos/etcd/raft/node_test.go
+20 −16		github.com/coreos/etcd/raft/raft.go
+19 −42		github.com/coreos/etcd/raft/raft_test.go
+0 −2		github.com/coreos/etcd/raft/rawnode.go