From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 12 May 2016 11:47:08 +0000 (+0000)
Subject: Merge "Make updateCollation wait for slaves every 500 (instead of 2000)"
X-Git-Tag: 1.31.0-rc.0~7007
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=e2eefa3a972ca8e85f2c9996bfdaf77b0cd1a9f5;p=lhc%2Fweb%2Fwiklou.git

Merge "Make updateCollation wait for slaves every 500 (instead of 2000)"
---

e2eefa3a972ca8e85f2c9996bfdaf77b0cd1a9f5