Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 7872505 70ded53)
Merge "Take 'host' parameter from neutron manifest into use"
authorJenkins <jenkins@review.openstack.org>
Thu, 2 Jun 2016 07:14:04 +0000 (07:14 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 2 Jun 2016 07:14:04 +0000 (07:14 +0000)
1  2 
puppet/hieradata/compute.yaml patch | diff1 | diff2 | blob | history
puppet/manifests/overcloud_compute.pp patch | diff1 | diff2 | blob | history

diff --cc puppet/hieradata/compute.yaml
Simple merge
diff --cc puppet/manifests/overcloud_compute.pp
Simple merge