Merge "Rewrite logstash key conflict warning from I6677dbf6"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 29 Nov 2016 22:53:10 +0000 (22:53 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 29 Nov 2016 22:53:10 +0000 (22:53 +0000)

Trivial merge