Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 41872c8 d6c1173)
Merge "Emits a different hostname for each network the node is on"
authorJenkins <jenkins@review.openstack.org>
Fri, 26 Feb 2016 23:28:25 +0000 (23:28 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 26 Feb 2016 23:28:25 +0000 (23:28 +0000)
1  2 
puppet/compute.yaml patch | diff1 | diff2 | blob | history
puppet/controller.yaml patch | diff1 | diff2 | blob | history

diff --cc puppet/compute.yaml
Simple merge
diff --cc puppet/controller.yaml
Simple merge