Merge "Remove ControllerClusterConfig from overcloud.yaml"
authorJenkins <jenkins@review.openstack.org>
Thu, 19 May 2016 08:58:58 +0000 (08:58 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 19 May 2016 08:58:58 +0000 (08:58 +0000)
1  2 
overcloud.yaml
puppet/controller.yaml

diff --cc overcloud.yaml
Simple merge
Simple merge