Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: dfcfb9d 80a1acb)
Merge "Move *Image parameters into role templates"
authorJenkins <jenkins@review.openstack.org>
Fri, 5 Aug 2016 10:47:48 +0000 (10:47 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 5 Aug 2016 10:47:48 +0000 (10:47 +0000)
1  2 
overcloud.yaml patch | diff1 | diff2 | blob | history
puppet/controller.yaml patch | diff1 | diff2 | blob | history

diff --cc overcloud.yaml
Simple merge
diff --cc puppet/controller.yaml
Simple merge