Merge "add support for collectd"
authorJenkins <jenkins@review.openstack.org>
Thu, 22 Dec 2016 23:12:33 +0000 (23:12 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 22 Dec 2016 23:12:33 +0000 (23:12 +0000)

Trivial merge