Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: b6623b4 96112c1)
Merge "Allow a deployer to specify HAProxy syslog server address"
authorJenkins <jenkins@review.openstack.org>
Fri, 16 Oct 2015 08:52:44 +0000 (08:52 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 16 Oct 2015 08:52:44 +0000 (08:52 +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