Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 954491c 9da4fae)
Merge "Puppet / Compute: allow to run Ephemeral only storage with RBD"
authorJenkins <jenkins@review.openstack.org>
Fri, 16 Oct 2015 14:31:31 +0000 (14:31 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 16 Oct 2015 14:31:31 +0000 (14:31 +0000)
1  2 
os-apply-config/compute.yaml patch | diff1 | diff2 | blob | history
overcloud-without-mergepy.yaml patch | diff1 | diff2 | blob | history
puppet/compute.yaml patch | diff1 | diff2 | blob | history

diff --cc os-apply-config/compute.yaml
Simple merge
diff --cc overcloud-without-mergepy.yaml
Simple merge
diff --cc puppet/compute.yaml
Simple merge