From 54819a304b4faa4fb237b5b33a457ddb09e8b38b Mon Sep 17 00:00:00 2001
From: Ben Darnell <ben@cockroachlabs.com>
Date: Tue, 17 Apr 2018 16:46:52 -0400
Subject: [PATCH] build: Update etcd

Picks up a cherry-picked version of coreos/etcd#9073, to fix #18601

Release note (bug fix): Fixes potential cluster unavailability after
raft logs grow too large.
---
 Gopkg.lock | 7 ++++---
 Gopkg.toml | 3 ++-
 vendor     | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 7092c177b5ce..c302d11183d5 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -151,10 +151,11 @@
   revision = "3a0bb77429bd3a61596f5e8a3172445844342120"
 
 [[projects]]
-  branch = "master"
+  branch = "crdb-release-1.1"
   name = "github.com/coreos/etcd"
   packages = ["raft","raft/raftpb"]
-  revision = "a9b9ef5640a2d0df0e3b9a23360ecd85eac22604"
+  revision = "4a7f0fd683aa85efb96729d5c2baf2b0721cda93"
+  source = "https://github.com/cockroachdb/etcd"
 
 [[projects]]
   name = "github.com/cpuguy83/go-md2man"
@@ -673,6 +674,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "c7d0491f4b2080056d743fbca09f9fa4ed2311a7429ccb22b06d83ecf72a8580"
+  inputs-digest = "68621641908662c4fa7a4ca9b76f49073ac23661db2b19586a443d5f1eec530c"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 06f176276660..511d99f629c2 100644
--- 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
index 91e1d64090e0..bf649312ab51 160000
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 91e1d64090e079a712f5b6682f5d39b559a13ada
+Subproject commit bf649312ab5129324b18ff885ac96ae1a8095c02