Merge "updates to fluentd support"
authorJenkins <jenkins@review.openstack.org>
Mon, 5 Sep 2016 09:01:31 +0000 (09:01 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 5 Sep 2016 09:01:31 +0000 (09:01 +0000)

Trivial merge