Merge pull request #512 from guits/quick_fix

author Leseb <seb@redhat.com>

Fri, 5 Feb 2016 15:41:35 +0000 (16:41 +0100)

committer Leseb <seb@redhat.com>

Fri, 5 Feb 2016 15:41:35 +0000 (16:41 +0100)
author Leseb <seb@redhat.com>
Fri, 5 Feb 2016 15:41:35 +0000 (16:41 +0100)
committer Leseb <seb@redhat.com>
Fri, 5 Feb 2016 15:41:35 +0000 (16:41 +0100)
diff --cc roles/ceph-common/tasks/main.yml
Simple merge
diff --cc roles/ceph-mon/tasks/deploy_monitors.yml
Simple merge
author	Leseb <seb@redhat.com>
	Fri, 5 Feb 2016 15:41:35 +0000 (16:41 +0100)
committer	Leseb <seb@redhat.com>
	Fri, 5 Feb 2016 15:41:35 +0000 (16:41 +0100)
		1	2
roles/ceph-common/tasks/main.yml	patch \|	diff1 \|	diff2 \|	blob \| history
roles/ceph-mon/tasks/deploy_monitors.yml	patch \|	diff1 \|	diff2 \|	blob \| history