Merge "Add NeutronExternalNetworkBridge parameter"
authorJenkins <jenkins@review.openstack.org>
Wed, 8 Jul 2015 19:28:32 +0000 (19:28 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 8 Jul 2015 19:28:32 +0000 (19:28 +0000)
1  2 
controller.yaml
overcloud-without-mergepy.yaml
puppet/controller-puppet.yaml

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