7 Commits

Author SHA1 Message Date
Yicheng Qin
5bd08a327d docs(standbys): specification for standby module 2014-05-08 15:02:55 -07:00
Yicheng Qin
c6be7887e5 docs(discovery): update cluster finding process 2014-05-07 06:55:09 -07:00
Yicheng Qin
67600603c5 chore: rename proxy mode to standby mode
It makes the name more reasonable.
2014-04-17 08:04:42 -07:00
Ben Johnson
62b89a128a Merge branch 'master' of https://github.com/coreos/etcd into proxy
Conflicts:
	config/config.go
	server/peer_server.go
	server/transporter.go
	tests/server_utils.go
2014-03-24 15:30:14 -07:00
Ben Johnson
7d4fda550d Machine join/remove v2 API. 2014-03-18 16:25:21 -06:00
Cong Ding
dbed0f7d6a fix(Documentation/*): fix various typos 2014-03-03 16:12:15 -08:00
Yicheng Qin
cf38910601 docs: boot order to find peers 2014-02-17 14:17:14 -08:00