Merge "Enable ceilometer compute agent" into stable/pike
authorJenkins <jenkins@review.openstack.org>
Tue, 29 Aug 2017 01:24:38 +0000 (01:24 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 29 Aug 2017 01:24:38 +0000 (01:24 +0000)

Trivial merge