Merge pull request #2104 from xiang90/timeout

etcdserver: make heartbeat/election configurable
2015-01-15 13:52:20 -08:00
parent 6bd8c435f9 276a4abac0
commit 1a6161d08a
8 changed files with 32 additions and 16 deletions
--- a/integration/cluster_test.go
+++ b/integration/cluster_test.go
@ -483,7 +483,7 @@ func mustNewMember(t *testing.T, name string) *member {
 	}
 	m.NewCluster = true
 	m.Transport = mustNewTransport(t)
-	m.ElectionTimeoutTicks = electionTicks
+	m.ElectionTicks = electionTicks
 	return m
 }

@ -513,7 +513,7 @@ func (m *member) Clone(t *testing.T) *member {
 		panic(err)
 	}
 	mm.Transport = mustNewTransport(t)
-	mm.ElectionTimeoutTicks = m.ElectionTimeoutTicks
+	mm.ElectionTicks = m.ElectionTicks
 	return mm
 }