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
..
discovery.md	fix(Documentation/*): fix various typos	2014-03-03 16:12:15 -08:00
proxies.md	Machine join/remove v2 API.	2014-03-18 16:25:21 -06:00