Merge pull request #569 from stpierre/skip-generate-fsid

author Leseb <seb@redhat.com>

Mon, 29 Feb 2016 15:11:46 +0000 (16:11 +0100)

committer Leseb <seb@redhat.com>

Mon, 29 Feb 2016 15:11:46 +0000 (16:11 +0100)
author Leseb <seb@redhat.com>
Mon, 29 Feb 2016 15:11:46 +0000 (16:11 +0100)
committer Leseb <seb@redhat.com>
Mon, 29 Feb 2016 15:11:46 +0000 (16:11 +0100)
diff --cc group_vars/all.sample
Simple merge
diff --cc roles/ceph-common/defaults/main.yml
Simple merge
diff --cc roles/ceph-common/tasks/main.yml
Simple merge
author	Leseb <seb@redhat.com>
	Mon, 29 Feb 2016 15:11:46 +0000 (16:11 +0100)
committer	Leseb <seb@redhat.com>
	Mon, 29 Feb 2016 15:11:46 +0000 (16:11 +0100)
		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/main.yml	patch \|	diff1 \|	diff2 \|	blob \| history