Merge "A few more DBLockManager fixes and cleanups"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 24 Aug 2016 03:15:31 +0000 (03:15 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 24 Aug 2016 03:15:31 +0000 (03:15 +0000)

Trivial merge