Merge "Avoid use of DB rollback() in LocalFileMoveBatch"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 25 Jul 2016 22:59:17 +0000 (22:59 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 25 Jul 2016 22:59:17 +0000 (22:59 +0000)

Trivial merge