Ben Johnson 62b89a128a Merge branch 'master' of https://github.com/coreos/etcd into proxy %!s(int64=12) %!d(string=hai) anos
..
tests df2b565397 fix(test/server): avoid watch test timeout by moving json decode %!s(int64=12) %!d(string=hai) anos
delete_key_handler.go 13b6c1e684 chore(*): make everything use goven %!s(int64=12) %!d(string=hai) anos
get_key_handler.go 13b6c1e684 chore(*): make everything use goven %!s(int64=12) %!d(string=hai) anos
set_key_handler.go 174b9ff343 bump(github.com/goraft/raft): 6bf34b9 %!s(int64=12) %!d(string=hai) anos
v1.go 174b9ff343 bump(github.com/goraft/raft): 6bf34b9 %!s(int64=12) %!d(string=hai) anos
watch_key_handler.go 13b6c1e684 chore(*): make everything use goven %!s(int64=12) %!d(string=hai) anos