Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 0b5459c 9923ead)
Merge "Ensure access to Redis is password protected"
authorJenkins <jenkins@review.openstack.org>
Tue, 15 Mar 2016 15:28:30 +0000 (15:28 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 15 Mar 2016 15:28:30 +0000 (15:28 +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