Merge pull request #48125 from guits/wip-57567-quincy

author Guillaume Abrioux <gabrioux@ibm.com>

Fri, 15 Sep 2023 07:58:21 +0000 (09:58 +0200)

committer GitHub <noreply@github.com>

Fri, 15 Sep 2023 07:58:21 +0000 (09:58 +0200)
author Guillaume Abrioux <gabrioux@ibm.com>
Fri, 15 Sep 2023 07:58:21 +0000 (09:58 +0200)
committer GitHub <noreply@github.com>
Fri, 15 Sep 2023 07:58:21 +0000 (09:58 +0200)
diff --cc src/ceph-volume/ceph_volume/tests/conftest.py
Simple merge
diff --cc src/ceph-volume/ceph_volume/util/device.py
Simple merge
diff --cc src/ceph-volume/ceph_volume/util/disk.py
Simple merge
author	Guillaume Abrioux <gabrioux@ibm.com>
	Fri, 15 Sep 2023 07:58:21 +0000 (09:58 +0200)
committer	GitHub <noreply@github.com>
	Fri, 15 Sep 2023 07:58:21 +0000 (09:58 +0200)
		1	2
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
src/ceph-volume/ceph_volume/util/disk.py	patch \|	diff1 \|	diff2 \|	blob \| history