Merge pull request #44768 from guits/wip-54008-octopus

author Guillaume Abrioux <gabrioux@redhat.com>

Wed, 2 Mar 2022 08:38:05 +0000 (09:38 +0100)

committer GitHub <noreply@github.com>

Wed, 2 Mar 2022 08:38:05 +0000 (09:38 +0100)
author Guillaume Abrioux <gabrioux@redhat.com>
Wed, 2 Mar 2022 08:38:05 +0000 (09:38 +0100)
committer GitHub <noreply@github.com>
Wed, 2 Mar 2022 08:38:05 +0000 (09:38 +0100)
diff --cc src/ceph-volume/ceph_volume/tests/devices/lvm/test_activate.py
Simple merge
author	Guillaume Abrioux <gabrioux@redhat.com>
	Wed, 2 Mar 2022 08:38:05 +0000 (09:38 +0100)
committer	GitHub <noreply@github.com>
	Wed, 2 Mar 2022 08:38:05 +0000 (09:38 +0100)