Merge "Make heat auth_encryption_key random"
authorJenkins <jenkins@review.openstack.org>
Mon, 16 Mar 2015 19:02:42 +0000 (19:02 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 16 Mar 2015 19:02:42 +0000 (19:02 +0000)
1  2 
controller.yaml
overcloud-without-mergepy.yaml
puppet/controller-puppet.yaml

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