mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00

* 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