Merge "Overcloud: bump HOT version to 2015-04-30"
authorJenkins <jenkins@review.openstack.org>
Thu, 21 May 2015 16:03:12 +0000 (16:03 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 21 May 2015 16:03:12 +0000 (16:03 +0000)
1  2 
controller.yaml
overcloud-without-mergepy.yaml
puppet/all-nodes-config.yaml
puppet/cinder-storage-puppet.yaml
puppet/compute-puppet.yaml
puppet/controller-puppet.yaml

diff --cc controller.yaml
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge