Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 558cd7d c392dff)
Merge "puppet: tidy up the Nova glance API server config"
authorJenkins <jenkins@review.openstack.org>
Thu, 19 Mar 2015 11:13:10 +0000 (11:13 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 19 Mar 2015 11:13:10 +0000 (11:13 +0000)
1  2 
puppet/compute-puppet.yaml patch | diff1 | diff2 | blob | history
puppet/manifests/overcloud_compute.pp patch | diff1 | diff2 | blob | history

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