From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 5 May 2017 00:31:02 +0000 (+0000)
Subject: Merge "EtcdConfig: Fix infinite timeout bug, and reduce timeout"
X-Git-Tag: 1.31.0-rc.0~3335
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=8bc99a87a2d4d64ea7c21a0a9c703862e9caaecb;p=lhc%2Fweb%2Fwiklou.git

Merge "EtcdConfig: Fix infinite timeout bug, and reduce timeout"
---

8bc99a87a2d4d64ea7c21a0a9c703862e9caaecb