Merge "Fix ControllerExtraConfig parameter name"
authorJenkins <jenkins@review.openstack.org>
Fri, 29 Apr 2016 16:31:51 +0000 (16:31 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 29 Apr 2016 16:31:51 +0000 (16:31 +0000)
1  2 
overcloud.yaml
puppet/controller.yaml

diff --cc overcloud.yaml
Simple merge
Simple merge