Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 68927e6 4638c80)
Merge "Adding optional aci-opflex hiera data"
authorJenkins <jenkins@review.openstack.org>
Thu, 25 Aug 2016 22:08:33 +0000 (22:08 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 25 Aug 2016 22:08:33 +0000 (22:08 +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