Merge pull request #1018 from ceph/profile-examples

author Sébastien Han <seb@redhat.com>

Fri, 28 Jul 2017 13:38:06 +0000 (15:38 +0200)

committer GitHub <noreply@github.com>

Fri, 28 Jul 2017 13:38:06 +0000 (15:38 +0200)
author Sébastien Han <seb@redhat.com>
Fri, 28 Jul 2017 13:38:06 +0000 (15:38 +0200)
committer GitHub <noreply@github.com>
Fri, 28 Jul 2017 13:38:06 +0000 (15:38 +0200)
diff --cc group_vars/all.yml.sample
Simple merge
diff --cc roles/ceph-common/defaults/main.yml
Simple merge
author	Sébastien Han <seb@redhat.com>
	Fri, 28 Jul 2017 13:38:06 +0000 (15:38 +0200)
committer	GitHub <noreply@github.com>
	Fri, 28 Jul 2017 13:38:06 +0000 (15:38 +0200)
		1	2
group_vars/all.yml.sample	patch \|	diff1 \|	diff2 \|	blob \| history
roles/ceph-common/defaults/main.yml	patch \|	diff1 \|	diff2 \|	blob \| history