From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 17 May 2016 09:24:15 +0000 (+0000)
Subject: Merge "Increase LocalFile lock() timeout and improve error message"
X-Git-Tag: 1.31.0-rc.0~6949
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=58dab5a2dc516c82fc9ef367e9a1defaab8d99b6;p=lhc%2Fweb%2Fwiklou.git

Merge "Increase LocalFile lock() timeout and improve error message"
---

58dab5a2dc516c82fc9ef367e9a1defaab8d99b6