Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: c643d4b 9b43153)
Merge "Introduce domain configuration through parameter"
authorJenkins <jenkins@review.openstack.org>
Thu, 3 Dec 2015 09:06:03 +0000 (09:06 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 3 Dec 2015 09:06:03 +0000 (09:06 +0000)
1  2 
overcloud-without-mergepy.yaml patch | diff1 | diff2 | blob | history
puppet/compute.yaml patch | diff1 | diff2 | blob | history
puppet/controller.yaml patch | diff1 | diff2 | blob | history

diff --cc overcloud-without-mergepy.yaml
Simple merge
diff --cc puppet/compute.yaml
Simple merge
diff --cc puppet/controller.yaml
Simple merge