Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 4ae1b72 ab6d154)
Merge "Combine Heat API networks into single net"
authorJenkins <jenkins@review.openstack.org>
Thu, 4 Jun 2015 13:36:51 +0000 (13:36 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 4 Jun 2015 13:36:51 +0000 (13:36 +0000)
1  2 
overcloud-without-mergepy.yaml patch | diff1 | diff2 | blob | history
puppet/controller-puppet.yaml patch | diff1 | diff2 | blob | history

diff --cc overcloud-without-mergepy.yaml
Simple merge
diff --cc puppet/controller-puppet.yaml
Simple merge