Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 0ecb075 d90363b)
Merge "Move out of roles any Ceph setting"
authorJenkins <jenkins@review.openstack.org>
Thu, 25 Aug 2016 21:06:55 +0000 (21:06 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 25 Aug 2016 21:06:55 +0000 (21:06 +0000)
1  2 
puppet/controller.yaml patch | diff1 | diff2 | blob | history
puppet/services/ceph-base.yaml patch | diff1 | diff2 | blob | history

diff --cc puppet/controller.yaml
Simple merge
diff --cc puppet/services/ceph-base.yaml
Simple merge