Merge "Configure Heat's ec2 auth uri correctly"
authorJenkins <jenkins@review.openstack.org>
Wed, 15 Jul 2015 12:36:25 +0000 (12:36 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 15 Jul 2015 12:36:25 +0000 (12:36 +0000)
1  2 
puppet/controller-puppet.yaml

Simple merge