Yicheng Qin 1811701427 Revert "etcdserver: fix cluster fallback recovery" ... This reverts commit cff005777a. Conflicts: etcdserver/server.go		2015-04-19 11:34:33 -07:00
..
config.go	Merge pull request #2633 from yichengq/deprecate	2015-04-09 10:22:30 -07:00
config_test.go	*: update to use IANA-assigned ports	2015-04-06 13:49:43 -07:00
const_unix.go	etcdmain: fix godeps on osx	2015-02-28 11:16:41 -08:00
const_windows.go	*: switch to line comments for copyright	2015-01-26 09:53:30 -08:00
doc.go	*: switch to line comments for copyright	2015-01-26 09:53:30 -08:00
etcd.go	Revert "etcdserver: fix cluster fallback recovery"	2015-04-19 11:34:33 -07:00
etcd_test.go	*: update to use IANA-assigned ports	2015-04-06 13:49:43 -07:00
help.go	etcdmain: deprecate --ca-file and --peer-ca-file	2015-04-09 10:14:32 -07:00
http.go	*: switch to line comments for copyright	2015-01-26 09:53:30 -08:00