Merge pull request #44066 from guits/guits-fix-rollback-osd

author Guillaume Abrioux <gabrioux@redhat.com>

Tue, 25 Jan 2022 10:03:35 +0000 (11:03 +0100)

committer GitHub <noreply@github.com>

Tue, 25 Jan 2022 10:03:35 +0000 (11:03 +0100)
author Guillaume Abrioux <gabrioux@redhat.com>
Tue, 25 Jan 2022 10:03:35 +0000 (11:03 +0100)
committer GitHub <noreply@github.com>
Tue, 25 Jan 2022 10:03:35 +0000 (11:03 +0100)
diff --cc src/ceph-volume/ceph_volume/devices/lvm/batch.py
Simple merge
diff --cc src/ceph-volume/ceph_volume/devices/lvm/common.py
Simple merge
author	Guillaume Abrioux <gabrioux@redhat.com>
	Tue, 25 Jan 2022 10:03:35 +0000 (11:03 +0100)
committer	GitHub <noreply@github.com>
	Tue, 25 Jan 2022 10:03:35 +0000 (11:03 +0100)
		1	2
src/ceph-volume/ceph_volume/devices/lvm/batch.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/ceph-volume/ceph_volume/devices/lvm/common.py	patch \|	diff1 \|	diff2 \|	blob \| history