Merge "Make safeWaitForMasterPos() use mWaitTimeout instead of hard-coded value"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 13 Sep 2016 04:33:26 +0000 (04:33 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 13 Sep 2016 04:33:26 +0000 (04:33 +0000)

Trivial merge