From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 19 Apr 2018 20:14:21 +0000 (+0000)
Subject: Merge "rdbms: make cancelAtomic() handle callbacks and work with DBO_TRX"
X-Git-Tag: 1.34.0-rc.0~5668
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=a7c20422341cf6c2556fe6093763e5dfd409a244;p=lhc%2Fweb%2Fwiklou.git

Merge "rdbms: make cancelAtomic() handle callbacks and work with DBO_TRX"
---

a7c20422341cf6c2556fe6093763e5dfd409a244