Merge "Use the local collector to bootstrap deployed servers"
authorJenkins <jenkins@review.openstack.org>
Thu, 6 Apr 2017 20:16:29 +0000 (20:16 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 6 Apr 2017 20:16:29 +0000 (20:16 +0000)

Trivial merge