Merge pull request #1627 from ceph/ceph-osd-prepare-script

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

Thu, 6 Jul 2017 14:08:59 +0000 (16:08 +0200)

committer GitHub <noreply@github.com>

Thu, 6 Jul 2017 14:08:59 +0000 (16:08 +0200)
author Sébastien Han <seb@redhat.com>
Thu, 6 Jul 2017 14:08:59 +0000 (16:08 +0200)
committer GitHub <noreply@github.com>
Thu, 6 Jul 2017 14:08:59 +0000 (16:08 +0200)
diff --cc tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/group_vars/all
Simple merge
author	Sébastien Han <seb@redhat.com>
	Thu, 6 Jul 2017 14:08:59 +0000 (16:08 +0200)
committer	GitHub <noreply@github.com>
	Thu, 6 Jul 2017 14:08:59 +0000 (16:08 +0200)