Merge pull request #858 from dang/custom-repo

author Leseb <seb@redhat.com>

Wed, 6 Jul 2016 13:30:49 +0000 (15:30 +0200)

committer GitHub <noreply@github.com>

Wed, 6 Jul 2016 13:30:49 +0000 (15:30 +0200)
author Leseb <seb@redhat.com>
Wed, 6 Jul 2016 13:30:49 +0000 (15:30 +0200)
committer GitHub <noreply@github.com>
Wed, 6 Jul 2016 13:30:49 +0000 (15:30 +0200)
diff --cc group_vars/all.sample
Simple merge
diff --cc roles/ceph-common/defaults/main.yml
Simple merge
diff --cc roles/ceph-common/tasks/installs/install_on_redhat.yml
Simple merge
author	Leseb <seb@redhat.com>
	Wed, 6 Jul 2016 13:30:49 +0000 (15:30 +0200)
committer	GitHub <noreply@github.com>
	Wed, 6 Jul 2016 13:30:49 +0000 (15:30 +0200)
		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/installs/install_on_redhat.yml	patch \|	diff1 \|	diff2 \|	blob \| history