From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 25 Jul 2017 02:18:05 +0000 (+0000)
Subject: Merge "config: Fix invalid EtcdConfig return value after JSON parse error"
X-Git-Tag: 1.31.0-rc.0~2614
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=9b38a467d3965c1453a19a29793d16cd126b1bfd;p=lhc%2Fweb%2Fwiklou.git

Merge "config: Fix invalid EtcdConfig return value after JSON parse error"
---

9b38a467d3965c1453a19a29793d16cd126b1bfd