Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 747e3b2 dea033b)
Merge "Move Neutron core and service plugin to base"
authorJenkins <jenkins@review.openstack.org>
Tue, 14 Jun 2016 08:49:44 +0000 (08:49 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 14 Jun 2016 08:49:44 +0000 (08:49 +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