Merge "Replace unused LoadBalancer::waitTimeout() method with a config setting"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 7 Sep 2016 06:45:55 +0000 (06:45 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 7 Sep 2016 06:45:55 +0000 (06:45 +0000)

Trivial merge