Merge pull request #696 from stpierre/dedup-rbd-client-dirs

author Leseb <seb@redhat.com>

Tue, 12 Apr 2016 10:03:56 +0000 (12:03 +0200)

committer Leseb <seb@redhat.com>

Tue, 12 Apr 2016 10:03:56 +0000 (12:03 +0200)
author Leseb <seb@redhat.com>
Tue, 12 Apr 2016 10:03:56 +0000 (12:03 +0200)
committer Leseb <seb@redhat.com>
Tue, 12 Apr 2016 10:03:56 +0000 (12:03 +0200)
diff --cc group_vars/all.sample
Simple merge
diff --cc roles/ceph-common/defaults/main.yml
Simple merge
diff --cc roles/ceph-common/tasks/installs/install_on_redhat.yml
Simple merge
author	Leseb <seb@redhat.com>
	Tue, 12 Apr 2016 10:03:56 +0000 (12:03 +0200)
committer	Leseb <seb@redhat.com>
	Tue, 12 Apr 2016 10:03:56 +0000 (12:03 +0200)
		1	2
group_vars/all.sample	patch \|	diff1 \|	diff2 \|	blob \| history
roles/ceph-common/defaults/main.yml	patch \|	diff1 \|	diff2 \|	blob \| history
roles/ceph-common/tasks/installs/install_on_redhat.yml	patch \|	diff1 \|	diff2 \|	blob \| history