Merge "Containerized collectd"
authorJenkins <jenkins@review.openstack.org>
Sun, 11 Jun 2017 22:45:13 +0000 (22:45 +0000)
committerGerrit Code Review <review@openstack.org>
Sun, 11 Jun 2017 22:45:13 +0000 (22:45 +0000)

Trivial merge