Sébastien Han 74ede6e166 Merge branch 'master' of https://github.com/jjoos/ceph-ansible into jjoos-master ... Signed-off-by: Sébastien Han <sebastien.han@enovance.com> Conflicts: roles/ceph-common/defaults/main.yml roles/ceph-common/tasks/Debian.yml roles/ceph-osd/tasks/journal_collocation.yml roles/ceph-osd/tasks/osd_directory.yml roles/ceph-osd/tasks/raw_journal.yml roles/ceph-osd/tasks/raw_multi_journal.yml		2014-11-06 15:18:56 +01:00
..
main.yml	Merge branch 'master' of https://github.com/jjoos/ceph-ansible into jjoos-master	2014-11-06 15:18:56 +01:00