From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 17 Jul 2018 01:09:25 +0000 (+0000)
Subject: Merge "objectcache: make BagOStuff::mergeViaLock() timeout more sensible"
X-Git-Tag: 1.34.0-rc.0~4751
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/supprimer.php?a=commitdiff_plain;h=df6491f78bb62a7c8da01c67ae518572cafe4c5b;p=lhc%2Fweb%2Fwiklou.git

Merge "objectcache: make BagOStuff::mergeViaLock() timeout more sensible"
---

df6491f78bb62a7c8da01c67ae518572cafe4c5b