diff --git a/Gopkg.lock b/Gopkg.lock
index 987878d02244..36ebbfeb5774 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -1489,7 +1489,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:51f3f946cfff94e96c8d0a8705a2bcd88d17a70408676ff740acd5255f40a537"
+  digest = "1:a5dd907052a1b42bbdf6a9608300143ee14f477bd6232597494203a21aa0fd45"
   name = "go.etcd.io/etcd"
   packages = [
     "raft",
@@ -1499,7 +1499,7 @@
     "raft/tracker",
   ]
   pruneopts = "UT"
-  revision = "62f4fb3c5eaed2a7614258083b4504f18bf44269"
+  revision = "d137fa9d4ad7aa242f6fed04186a700ce082fdda"
 
 [[projects]]
   digest = "1:3b5a3bc35810830ded5e26ef9516e933083a2380d8e57371fdfde3c70d7c6952"
diff --git a/pkg/storage/replica_raft.go b/pkg/storage/replica_raft.go
index e11ae2529640..80af71195e2e 100644
--- a/pkg/storage/replica_raft.go
+++ b/pkg/storage/replica_raft.go
@@ -1265,7 +1265,7 @@ func (r *Replica) withRaftGroupLocked(
 			r.mu.state.RaftAppliedIndex,
 			r.store.cfg,
 			&raftLogger{ctx: ctx},
-		), nil)
+		))
 		if err != nil {
 			return err
 		}
diff --git a/pkg/storage/replica_raftstorage.go b/pkg/storage/replica_raftstorage.go
index 7d6793b4e288..a0d6e8fbe7e2 100644
--- a/pkg/storage/replica_raftstorage.go
+++ b/pkg/storage/replica_raftstorage.go
@@ -67,7 +67,7 @@ func (r *replicaRaftStorage) InitialState() (raftpb.HardState, raftpb.ConfState,
 	}
 	var cs raftpb.ConfState
 	for _, rep := range r.mu.state.Desc.Replicas().Voters() {
-		cs.Nodes = append(cs.Nodes, uint64(rep.ReplicaID))
+		cs.Voters = append(cs.Voters, uint64(rep.ReplicaID))
 	}
 	for _, rep := range r.mu.state.Desc.Replicas().Learners() {
 		cs.Learners = append(cs.Learners, uint64(rep.ReplicaID))
@@ -540,7 +540,7 @@ func snapshot(
 	// Synthesize our raftpb.ConfState from desc.
 	var cs raftpb.ConfState
 	for _, rep := range desc.Replicas().Voters() {
-		cs.Nodes = append(cs.Nodes, uint64(rep.ReplicaID))
+		cs.Voters = append(cs.Voters, uint64(rep.ReplicaID))
 	}
 	for _, rep := range desc.Replicas().Learners() {
 		cs.Learners = append(cs.Learners, uint64(rep.ReplicaID))
diff --git a/pkg/storage/store_snapshot_preemptive.go b/pkg/storage/store_snapshot_preemptive.go
index 207438203eb7..9c8893a93980 100644
--- a/pkg/storage/store_snapshot_preemptive.go
+++ b/pkg/storage/store_snapshot_preemptive.go
@@ -303,7 +303,7 @@ func (s *Store) processPreemptiveSnapshotRequest(
 				appliedIndex,
 				r.store.cfg,
 				&raftLogger{ctx: ctx},
-			), nil)
+			))
 		if err != nil {
 			return roachpb.NewError(err)
 		}
diff --git a/vendor b/vendor
index ab736d516a48..7c852f2ccd37 160000
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit ab736d516a4867f3179c0d703cdca9c29a9ec4b3
+Subproject commit 7c852f2ccd374446039567068281b576886be13b