Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 7ad4da5 479edff)
Merge "Replace hardcoded 'br-ex' with NeutronPhysicalBridge parameter."
authorJenkins <jenkins@review.openstack.org>
Sat, 24 Jun 2017 00:36:01 +0000 (00:36 +0000)
committerGerrit Code Review <review@openstack.org>
Sat, 24 Jun 2017 00:36:01 +0000 (00:36 +0000)
1  2 
puppet/compute-role.yaml patch | diff1 | diff2 | blob | history
puppet/controller-role.yaml patch | diff1 | diff2 | blob | history
puppet/role.role.j2.yaml patch | diff1 | diff2 | blob | history

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