Merge "Fix ceilometer auth url"
authorJenkins <jenkins@review.openstack.org>
Wed, 29 Jun 2016 18:13:08 +0000 (18:13 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 29 Jun 2016 18:13:08 +0000 (18:13 +0000)
1  2 
puppet/controller.yaml

Simple merge