Merge "Add services to ServiceNetMap to select hostnames resolution network"
authorJenkins <jenkins@review.openstack.org>
Fri, 10 Jul 2015 14:44:35 +0000 (14:44 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 10 Jul 2015 14:44:36 +0000 (14:44 +0000)
1  2 
overcloud-without-mergepy.yaml
puppet/controller-puppet.yaml

Simple merge
Simple merge