From: Jan Fajerski <jfajerski@suse.com>
Date: Wed, 9 Dec 2020 15:55:47 +0000 (+0100)
Subject: Merge PR #38199 into octopus
X-Git-Tag: v15.2.8~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c838525812d6c365a413984a8dda80d36fe5ba9a;p=ceph.git

Merge PR #38199 into octopus

* refs/pull/38199/head:
	ceph-volume: fix test_setup_device_device_name_is_none
	ceph-volume: cover devices.lvm.prepare.setup_device
	ceph-volume: fix filestore/dmcrypt activate

Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
---

c838525812d6c365a413984a8dda80d36fe5ba9a