Merge pull request #1741 from ceph/refactor-installation

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

Wed, 30 Aug 2017 15:42:29 +0000 (17:42 +0200)

committer GitHub <noreply@github.com>

Wed, 30 Aug 2017 15:42:29 +0000 (17:42 +0200)
author Sébastien Han <seb@redhat.com>
Wed, 30 Aug 2017 15:42:29 +0000 (17:42 +0200)
committer GitHub <noreply@github.com>
Wed, 30 Aug 2017 15:42:29 +0000 (17:42 +0200)
diff --cc tests/functional/centos/7/bs-crypt-jrn-col/group_vars/all
Simple merge
diff --cc tests/functional/centos/7/bs-dock-crypt-jrn-col/group_vars/all
Simple merge
diff --cc tests/functional/centos/7/bs-dock-ded-jrn/group_vars/all
Simple merge
diff --cc tests/functional/centos/7/bs-docker/group_vars/all
Simple merge
diff --cc tests/functional/centos/7/cluster/group_vars/all
Simple merge
diff --cc tests/functional/centos/7/crypt-ded-jrn/group_vars/all
Simple merge
diff --cc tests/functional/centos/7/crypt-jrn-col/group_vars/all
Simple merge
diff --cc tests/functional/centos/7/docker-crypt-jrn-col/group_vars/all
Simple merge
diff --cc tests/functional/centos/7/docker-ded-jrn/group_vars/all
Simple merge
diff --cc tests/functional/centos/7/docker/group_vars/all
Simple merge
diff --cc tests/functional/centos/7/jrn-col/group_vars/all
Simple merge
author	Sébastien Han <seb@redhat.com>
	Wed, 30 Aug 2017 15:42:29 +0000 (17:42 +0200)
committer	GitHub <noreply@github.com>
	Wed, 30 Aug 2017 15:42:29 +0000 (17:42 +0200)
		1	2
tests/functional/centos/7/bs-crypt-jrn-col/group_vars/all	patch \|	diff1 \|	diff2 \|	blob \| history
tests/functional/centos/7/bs-dock-crypt-jrn-col/group_vars/all	patch \|	diff1 \|	diff2 \|	blob \| history
tests/functional/centos/7/bs-dock-ded-jrn/group_vars/all	patch \|	diff1 \|	diff2 \|	blob \| history
tests/functional/centos/7/bs-docker/group_vars/all	patch \|	diff1 \|	diff2 \|	blob \| history
tests/functional/centos/7/cluster/group_vars/all	patch \|	diff1 \|	diff2 \|	blob \| history
tests/functional/centos/7/crypt-ded-jrn/group_vars/all	patch \|	diff1 \|	diff2 \|	blob \| history
tests/functional/centos/7/crypt-jrn-col/group_vars/all	patch \|	diff1 \|	diff2 \|	blob \| history
tests/functional/centos/7/docker-crypt-jrn-col/group_vars/all	patch \|	diff1 \|	diff2 \|	blob \| history
tests/functional/centos/7/docker-ded-jrn/group_vars/all	patch \|	diff1 \|	diff2 \|	blob \| history
tests/functional/centos/7/docker/group_vars/all	patch \|	diff1 \|	diff2 \|	blob \| history
tests/functional/centos/7/jrn-col/group_vars/all	patch \|	diff1 \|	diff2 \|	blob \| history