Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: bac7f95 5009cc6)
Merge "puppet: wire in osfamily hieradata support"
authorJenkins <jenkins@review.openstack.org>
Wed, 1 Apr 2015 19:26:14 +0000 (19:26 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 1 Apr 2015 19:26:14 +0000 (19:26 +0000)
1  2 
puppet/cinder-storage-puppet.yaml patch | diff1 | diff2 | blob | history
puppet/compute-puppet.yaml patch | diff1 | diff2 | blob | history
puppet/controller-puppet.yaml patch | diff1 | diff2 | blob | history

diff --cc puppet/cinder-storage-puppet.yaml
Simple merge
diff --cc puppet/compute-puppet.yaml
Simple merge
diff --cc puppet/controller-puppet.yaml
Simple merge