Merge "set aodh auth_url explicitly"
authorJenkins <jenkins@review.openstack.org>
Tue, 21 Jun 2016 06:22:27 +0000 (06:22 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 21 Jun 2016 06:22:27 +0000 (06:22 +0000)
1  2 
puppet/controller.yaml

Simple merge