Merge "Rename ServiceNetMap: NeutronLocalIp"
authorJenkins <jenkins@review.openstack.org>
Thu, 18 Jun 2015 14:52:27 +0000 (14:52 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 18 Jun 2015 14:52:27 +0000 (14:52 +0000)
1  2 
overcloud-without-mergepy.yaml
puppet/compute-puppet.yaml
puppet/controller-puppet.yaml

Simple merge
Simple merge
Simple merge