From 407ace4aeafbdb7c81e3dd378dcc803ee0d129e0 Mon Sep 17 00:00:00 2001
From: Tobias Schottdorf <tobias.schottdorf@gmail.com>
Date: Fri, 16 Aug 2019 17:34:59 +0200
Subject: [PATCH] [dnm] vendor: bump raft

This picks up upstream fixes related to atomic membership changes.

I had to smuggle in a small hack because we're picking up
https://github.com/etcd-io/etcd/pull/11037 which makes a race between
the snapshot queue and the proactive learner snapshot much more likely,
and this in turn makes tests quite flaky because it turns out that if
the learner snap loses, it can actually error out.

Release note: None
---
 Gopkg.lock | 7 ++++---
 Gopkg.toml | 4 +++-
 vendor     | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 543c87e03175..1ca8fe86215f 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -1519,8 +1519,8 @@
   revision = "b5bfa59ec0adc420475f97f89b58045c721d761c"
 
 [[projects]]
-  branch = "master"
-  digest = "1:7b2765d91bece066a1cb4928d8b39cce152a6a08602e13b1169648c2f200cfff"
+  branch = "crl-bump"
+  digest = "1:a982c802e9fced15a22448839db3fea22853a3b711f55e3388deb1cd1b8e8b9f"
   name = "go.etcd.io/etcd"
   packages = [
     "raft",
@@ -1530,7 +1530,8 @@
     "raft/tracker",
   ]
   pruneopts = "UT"
-  revision = "4a4629fd9f01d4e2669c4f537a56a0019d95617e"
+  revision = "81d090463b9619e7a3a3e7faa4959f1f10af0b08"
+  source = "https://github.com/tbg/etcd"
 
 [[projects]]
   digest = "1:3b5a3bc35810830ded5e26ef9516e933083a2380d8e57371fdfde3c70d7c6952"
diff --git a/Gopkg.toml b/Gopkg.toml
index befd0922f629..7332b78256a8 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -38,7 +38,9 @@ ignored = [
 
 [[constraint]]
   name = "go.etcd.io/etcd"
-  branch = "master"
+  # branch = "master"
+  branch = "crl-bump"
+  source = "https://github.com/tbg/etcd"
 
 # Used for the API client; we want the latest.
 [[constraint]]
diff --git a/vendor b/vendor
index 1ca960a396a6..ac3dbb07b176 160000
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 1ca960a396a6d77cedbd545a15d3eff9c24933cc
+Subproject commit ac3dbb07b17664c4ed3895de99542ac156b6a619