Merge pull request #449 from nexecook/pre-infernalis_fixes

author Leseb <seb@redhat.com>

Sat, 12 Dec 2015 12:34:23 +0000 (13:34 +0100)

committer Leseb <seb@redhat.com>

Sat, 12 Dec 2015 12:34:23 +0000 (13:34 +0100)
author Leseb <seb@redhat.com>
Sat, 12 Dec 2015 12:34:23 +0000 (13:34 +0100)
committer Leseb <seb@redhat.com>
Sat, 12 Dec 2015 12:34:23 +0000 (13:34 +0100)
diff --cc group_vars/all.sample
Simple merge
diff --cc roles/ceph-common/defaults/main.yml
Simple merge
author	Leseb <seb@redhat.com>
	Sat, 12 Dec 2015 12:34:23 +0000 (13:34 +0100)
committer	Leseb <seb@redhat.com>
	Sat, 12 Dec 2015 12:34:23 +0000 (13:34 +0100)
		1	2
group_vars/all.sample	patch \|	diff1 \|	diff2 \|	blob \| history
roles/ceph-common/defaults/main.yml	patch \|	diff1 \|	diff2 \|	blob \| history