Ben Johnson 62b89a128a Merge branch 'master' of https://github.com/coreos/etcd into proxy 11 years ago
..
config.go 62b89a128a Merge branch 'master' of https://github.com/coreos/etcd into proxy 11 years ago
config_test.go f5698d3566 Proxy promotion. 11 years ago
timeout.go f434177a9a chore: rename 'heartbeat timeout' to 'heartbeat interval' 12 years ago