Merge "Avoid calling rollback() in handleWriteError() if there is no trx"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 25 Feb 2015 09:16:04 +0000 (09:16 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 25 Feb 2015 09:16:04 +0000 (09:16 +0000)

Trivial merge