Merge "config: Fix invalid EtcdConfig return value after JSON parse error"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 25 Jul 2017 02:18:05 +0000 (02:18 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 25 Jul 2017 02:18:05 +0000 (02:18 +0000)

Trivial merge