Merge pull request #25477 from alfredodeza/wip-rm37486

author Alfredo Deza <alfredo@deza.pe>

Thu, 13 Dec 2018 15:36:21 +0000 (10:36 -0500)

committer GitHub <noreply@github.com>

Thu, 13 Dec 2018 15:36:21 +0000 (10:36 -0500)
author Alfredo Deza <alfredo@deza.pe>
Thu, 13 Dec 2018 15:36:21 +0000 (10:36 -0500)
committer GitHub <noreply@github.com>
Thu, 13 Dec 2018 15:36:21 +0000 (10:36 -0500)
diff --cc src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_bluestore.yml
Simple merge
diff --cc src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_filestore.yml
Simple merge
author	Alfredo Deza <alfredo@deza.pe>
	Thu, 13 Dec 2018 15:36:21 +0000 (10:36 -0500)
committer	GitHub <noreply@github.com>
	Thu, 13 Dec 2018 15:36:21 +0000 (10:36 -0500)
		1	2
src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_bluestore.yml	patch \|	diff1 \|	diff2 \|	blob \| history
src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_filestore.yml	patch \|	diff1 \|	diff2 \|	blob \| history