Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,700 Commits 15 Branches 491 Tags 148 MiB
Commit Graph

4 Commits

Author SHA1 Message Date
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