Merge "EtcdConfig: Fix infinite timeout bug, and reduce timeout"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 5 May 2017 00:31:02 +0000 (00:31 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 5 May 2017 00:31:02 +0000 (00:31 +0000)

Trivial merge