Merge pull request #694 from ceph/purge-ceph-conf-options

author Leseb <seb@redhat.com>

Tue, 10 May 2016 16:24:07 +0000 (18:24 +0200)

committer Leseb <seb@redhat.com>

Tue, 10 May 2016 16:24:07 +0000 (18:24 +0200)
author Leseb <seb@redhat.com>
Tue, 10 May 2016 16:24:07 +0000 (18:24 +0200)
committer Leseb <seb@redhat.com>
Tue, 10 May 2016 16:24:07 +0000 (18:24 +0200)
diff --cc README.md
Simple merge
diff --cc group_vars/all.sample
Simple merge
diff --cc roles/ceph-common/defaults/main.yml
Simple merge
author	Leseb <seb@redhat.com>
	Tue, 10 May 2016 16:24:07 +0000 (18:24 +0200)
committer	Leseb <seb@redhat.com>
	Tue, 10 May 2016 16:24:07 +0000 (18:24 +0200)
		1	2
README.md	patch \|	diff1 \|	diff2 \|	blob \| history
group_vars/all.sample	patch \|	diff1 \|	diff2 \|	blob \| history
roles/ceph-common/defaults/main.yml	patch \|	diff1 \|	diff2 \|	blob \| history