git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commit

]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commit

author	Sébastien Han <sebastien.han@enovance.com>
	Wed, 5 Nov 2014 16:57:28 +0000 (17:57 +0100)
committer	Sébastien Han <sebastien.han@enovance.com>
	Thu, 6 Nov 2014 14:18:56 +0000 (15:18 +0100)
commit	74ede6e16639cd0246325f26889cef9023355264
tree	6ece695405ce424ac5a2b4b50fc487d20a6db652	tree \| snapshot
parent	55f964d75b9326095627c678eaf567d606d56663	commit \| diff
parent	5e8141f8cf355f3eb3c5330f791251153e8a912d	commit \| diff

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

15 files changed:

roles/ceph-common/handlers/main.yml	diff1 \|	diff2 \|	blob \| history
roles/ceph-common/tasks/install_on_debian.yml	\|	diff2 \|	blob \| history
roles/ceph-common/tasks/install_on_redhat.yml	\|	diff2 \|	blob \| history
roles/ceph-common/tasks/main.yml	diff1 \|	diff2 \|	blob \| history
roles/ceph-common/vars/main.yml	diff1 \|	diff2 \|	blob \| history
roles/ceph-mds/tasks/main.yml	diff1 \|	diff2 \|	blob \| history
roles/ceph-mon/tasks/main.yml	diff1 \|	diff2 \|	blob \| history
roles/ceph-osd/tasks/activate_osds.yml	\|	diff2 \|	blob \| history
roles/ceph-osd/tasks/main.yml	diff1 \|	diff2 \|	blob \| history
roles/ceph-osd/tasks/osd_directory.yml	diff1 \|	diff2 \|	blob \| history
roles/ceph-osd/vars/main.yml	diff1 \|	diff2 \|	blob \| history
roles/ceph-radosgw/tasks/install_redhat.yml	\|	diff2 \|	blob \| history
roles/ceph-radosgw/tasks/main.yml	diff1 \|	diff2 \|	blob \| history
roles/haproxy/tasks/precise.yml	diff1 \|	diff2 \|	blob \| history
rolling_update.yml	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

roles/ceph-common/handlers/main.yml	diff1 \|	diff2 \|	blob \| history
roles/ceph-common/tasks/install_on_debian.yml	\|	diff2 \|	blob \| history
roles/ceph-common/tasks/install_on_redhat.yml	\|	diff2 \|	blob \| history
roles/ceph-common/tasks/main.yml	diff1 \|	diff2 \|	blob \| history
roles/ceph-common/vars/main.yml	diff1 \|	diff2 \|	blob \| history
roles/ceph-mds/tasks/main.yml	diff1 \|	diff2 \|	blob \| history
roles/ceph-mon/tasks/main.yml	diff1 \|	diff2 \|	blob \| history
roles/ceph-osd/tasks/activate_osds.yml	\|	diff2 \|	blob \| history
roles/ceph-osd/tasks/main.yml	diff1 \|	diff2 \|	blob \| history
roles/ceph-osd/tasks/osd_directory.yml	diff1 \|	diff2 \|	blob \| history
roles/ceph-osd/vars/main.yml	diff1 \|	diff2 \|	blob \| history
roles/ceph-radosgw/tasks/install_redhat.yml	\|	diff2 \|	blob \| history
roles/ceph-radosgw/tasks/main.yml	diff1 \|	diff2 \|	blob \| history
roles/haproxy/tasks/precise.yml	diff1 \|	diff2 \|	blob \| history
rolling_update.yml	diff1 \|	diff2 \|	blob \| history