Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 83fd16e 97b12af)
Merge "Inject TLS certificate and keys for the Overcloud"
authorJenkins <jenkins@review.openstack.org>
Wed, 25 Nov 2015 17:57:38 +0000 (17:57 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 25 Nov 2015 17:57:38 +0000 (17:57 +0000)
1  2 
overcloud-without-mergepy.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/controller.yaml
Simple merge