Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 309931c 0064f5e)
Merge "Add SSL PKI properties for keystone"
authorJenkins <jenkins@review.openstack.org>
Thu, 30 Oct 2014 09:11:01 +0000 (09:11 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 30 Oct 2014 09:11:01 +0000 (09:11 +0000)
1  2 
overcloud-source.yaml patch | diff1 | diff2 | blob | history
undercloud-source.yaml patch | diff1 | diff2 | blob | history

diff --cc overcloud-source.yaml
Simple merge
diff --cc undercloud-source.yaml
Simple merge