]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
Merge branch 'fix_template_path' of https://github.com/Sysnove/ceph-ansible into...
authorSébastien Han <sebastien.han@enovance.com>
Thu, 14 Aug 2014 12:30:33 +0000 (14:30 +0200)
committerSébastien Han <sebastien.han@enovance.com>
Thu, 14 Aug 2014 12:30:33 +0000 (14:30 +0200)
Conflicts:
roles/ceph-common/tasks/Debian.yml
roles/ceph-common/tasks/RedHat.yml

1  2 
roles/ceph-common/tasks/Debian.yml
roles/ceph-common/tasks/RedHat.yml

Simple merge
Simple merge