Merge pull request #30805 from jan--f/wip-42236-nautilus

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

Fri, 1 Nov 2019 13:38:35 +0000 (14:38 +0100)

committer GitHub <noreply@github.com>

Fri, 1 Nov 2019 13:38:35 +0000 (14:38 +0100)
author Jan Fajerski <jan--f@users.noreply.github.com>
Fri, 1 Nov 2019 13:38:35 +0000 (14:38 +0100)
committer GitHub <noreply@github.com>
Fri, 1 Nov 2019 13:38:35 +0000 (14:38 +0100)
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
diff --cc src/ceph-volume/ceph_volume/util/device.py
Simple merge
author	Jan Fajerski <jan--f@users.noreply.github.com>
	Fri, 1 Nov 2019 13:38:35 +0000 (14:38 +0100)
committer	GitHub <noreply@github.com>
	Fri, 1 Nov 2019 13:38:35 +0000 (14:38 +0100)
		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
src/ceph-volume/ceph_volume/util/device.py	patch \|	diff1 \|	diff2 \|	blob \| history