Merge pull request #16307 from rrati/etcd-client-oneshot-fix-3.6

Automatic merge from submit-queue Fix for etcd client oneshot cluster member cycling Backport of etcd-io/etcd#8519
openshift · Sep 15, 2017 · b3b8ade · b3b8ade
2 parents 95f63d9 + 52d57ee
commit b3b8ade
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/vendor/github.com/coreos/etcd/client/client.go b/vendor/github.com/coreos/etcd/client/client.go