Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 4d4a544 2de01bc)
Merge "Move Ceph OSD data path configuration into static ceph.yaml file"
authorJenkins <jenkins@review.openstack.org>
Tue, 5 May 2015 08:58:36 +0000 (08:58 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 5 May 2015 08:58:36 +0000 (08:58 +0000)
1  2 
puppet/ceph-cluster-config.yaml patch | diff1 | diff2 | blob | history
puppet/hieradata/ceph.yaml patch | diff1 | diff2 | blob | history

diff --cc puppet/ceph-cluster-config.yaml
Simple merge
diff --cc puppet/hieradata/ceph.yaml
Simple merge