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
..
config.go	Merge branch 'master' of https://github.com/coreos/etcd into proxy	2014-03-24 15:30:14 -07:00
config_test.go	Proxy promotion.	2014-02-24 17:01:04 -07:00
timeout.go	chore: rename 'heartbeat timeout' to 'heartbeat interval'	2014-02-18 16:37:20 -08:00