Merge "Add sanity check to getScopedLockAndFlush() for pending writes"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 18 Aug 2016 18:31:54 +0000 (18:31 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 18 Aug 2016 18:31:54 +0000 (18:31 +0000)

Trivial merge