Merge #27024

27024: release-2.0: cherry-pick etcd-io/etcd#9887 r=tschottdorf a=bdarnell This is the release-2.0 counterpart to #27009. Release note (bug fix): Alleviate a scenario in which a large number of uncommitted Raft commands could cause memory pressure at startup time. Co-authored-by: Ben Darnell <ben@cockroachlabs.com>
cockroachdb · Jun 28, 2018 · 2dd9fa6 · 2dd9fa6
2 parents a149acc + b31dd58
commit 2dd9fa6
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
@@ -32,7 +32,8 @@ ignored = [
 # https://github.com/coreos/etcd/commit/ce0ad377
 [[constraint]]
   name = "github.com/coreos/etcd"
-  branch = "master"
+  source = "https://github.com/cockroachdb/etcd"
+  branch = "crdb-release-2.0"
 
 # Used for the API client; we want the latest.
 [[constraint]]

diff --git a/vendor b/vendor