Merge pull request #2117 from ceph/rm-dup

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

Fri, 27 Oct 2017 11:49:52 +0000 (13:49 +0200)

committer GitHub <noreply@github.com>

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