Merge "rdbms: Avoid declaration incompatibility IDEA warnings in safeWaitForMasterPos()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 7 Feb 2017 18:48:13 +0000 (18:48 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 7 Feb 2017 18:48:13 +0000 (18:48 +0000)

Trivial merge