ceph-ansible/roles/haproxy
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
..
files/precise Initial add of haproxy example for fronting a number of radosgw's 2014-03-15 08:58:24 +00:00
handlers Sweep of all sorts of things. 2014-09-04 21:14:11 +02:00
tasks Merge branch 'master' of https://github.com/jjoos/ceph-ansible into jjoos-master 2014-11-06 15:18:56 +01:00
templates/precise re-tab/indent configuration 2014-03-17 10:27:49 +00:00
vars Sweep of all sorts of things. 2014-09-04 21:14:11 +02:00