Merge pull request #661 from PiotrProkop/ceph-osd-kv

author Leseb <seb@redhat.com>

Tue, 29 Mar 2016 12:15:40 +0000 (14:15 +0200)

committer Leseb <seb@redhat.com>

Tue, 29 Mar 2016 12:15:40 +0000 (14:15 +0200)
author Leseb <seb@redhat.com>
Tue, 29 Mar 2016 12:15:40 +0000 (14:15 +0200)
committer Leseb <seb@redhat.com>
Tue, 29 Mar 2016 12:15:40 +0000 (14:15 +0200)
diff --cc group_vars/osds.sample
Simple merge
diff --cc roles/ceph-osd/defaults/main.yml
Simple merge
author	Leseb <seb@redhat.com>
	Tue, 29 Mar 2016 12:15:40 +0000 (14:15 +0200)
committer	Leseb <seb@redhat.com>
	Tue, 29 Mar 2016 12:15:40 +0000 (14:15 +0200)
		1	2
group_vars/osds.sample	patch \|	diff1 \|	diff2 \|	blob \| history
roles/ceph-osd/defaults/main.yml	patch \|	diff1 \|	diff2 \|	blob \| history