Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: d9e24c1 3729e63)
Merge "Support NFS backend for Glance (via Pacemaker)"
authorJenkins <jenkins@review.openstack.org>
Mon, 2 Nov 2015 12:23:56 +0000 (12:23 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 2 Nov 2015 12:23:56 +0000 (12:23 +0000)
1  2 
puppet/controller.yaml patch | diff1 | diff2 | blob | history
puppet/hieradata/controller.yaml patch | diff1 | diff2 | blob | history
puppet/manifests/overcloud_controller_pacemaker.pp patch | diff1 | diff2 | blob | history

diff --cc puppet/controller.yaml
Simple merge
diff --cc puppet/hieradata/controller.yaml
Simple merge