]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #38199 into octopus
authorJan Fajerski <jfajerski@suse.com>
Wed, 9 Dec 2020 15:55:47 +0000 (16:55 +0100)
committerJan Fajerski <jfajerski@suse.com>
Wed, 9 Dec 2020 15:55:47 +0000 (16:55 +0100)
* 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>

Trivial merge