3 Commits

Author	SHA1	Message	Date
Ben Darnell	30690d15d9	Re-enable a few tests I had missed. ... Fix integration test for the change to log entry zero. Increase test timeouts since integration tests often take longer than 10s for me.	2014-11-21 15:27:17 -05:00
Ben Darnell	300c5a2001	Merge remote-tracking branch 'coreos/master' into log-storage-interface ... * coreos/master: (21 commits) etcdserver: refactor ValidateClusterAndAssignIDs integration: add integration test for remove member integration: add test for member restart version: bump to alpha.3 etcdserver: add buffer to the sender queue *: gracefully stop etcdserver Fix up migration tool, add snapshot migration etcd4: migration from v0.4 -> v0.5 etcdserver: export Member.StoreKey etcdserver: recover cluster when receiving newer snapshot etcdserver: check and select committed entries to apply etcdserver: recover from snapshot before applying requests raft: not set applied when restored from snapshot sender: support elegant stop etcdserver: add StopNotify etcdserver: fix TestDoProposalStopped test etcdserver: minor cleanup etcdserver: validate new node is not registered before in best effort etcdserver: fix server.Stop() *: print out configuration when necessary ... Conflicts: etcdserver/server.go etcdserver/server_test.go raft/log.go	2014-11-17 18:28:24 -05:00
Xiang Li	800747e1cf	integration: add test for member restart	2014-11-17 11:28:18 -08:00