Merge "Fix ceilometer agent compute service name"
authorJenkins <jenkins@review.openstack.org>
Wed, 2 Aug 2017 21:04:45 +0000 (21:04 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 2 Aug 2017 21:04:45 +0000 (21:04 +0000)

Trivial merge