Merge pull request #30808 from jan--f/wip-42233-mimic

author Jan Fajerski <jan--f@users.noreply.github.com>

Fri, 18 Oct 2019 12:02:01 +0000 (14:02 +0200)

committer GitHub <noreply@github.com>

Fri, 18 Oct 2019 12:02:01 +0000 (14:02 +0200)
author Jan Fajerski <jan--f@users.noreply.github.com>
Fri, 18 Oct 2019 12:02:01 +0000 (14:02 +0200)
committer GitHub <noreply@github.com>
Fri, 18 Oct 2019 12:02:01 +0000 (14:02 +0200)
diff --cc src/ceph-volume/ceph_volume/api/lvm.py
Simple merge
diff --cc src/ceph-volume/ceph_volume/tests/api/test_lvm.py
Simple merge
diff --cc src/ceph-volume/ceph_volume/tests/conftest.py
Simple merge
author	Jan Fajerski <jan--f@users.noreply.github.com>
	Fri, 18 Oct 2019 12:02:01 +0000 (14:02 +0200)
committer	GitHub <noreply@github.com>
	Fri, 18 Oct 2019 12:02:01 +0000 (14:02 +0200)
		1	2
src/ceph-volume/ceph_volume/api/lvm.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/ceph-volume/ceph_volume/tests/api/test_lvm.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/ceph-volume/ceph_volume/tests/conftest.py	patch \|	diff1 \|	diff2 \|	blob \| history