From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 29 Nov 2016 22:53:10 +0000 (+0000)
Subject: Merge "Rewrite logstash key conflict warning from I6677dbf6"
X-Git-Tag: 1.31.0-rc.0~4736
X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=82dff2f46c95d527de8a1fd32961c22832eb5444;p=lhc%2Fweb%2Fwiklou.git

Merge "Rewrite logstash key conflict warning from I6677dbf6"
---

82dff2f46c95d527de8a1fd32961c22832eb5444