From: Lenz Grimmer <lgrimmer@suse.com>
Date: Wed, 12 Aug 2020 16:09:17 +0000 (+0200)
Subject: Merge pull request #36563 from s0nea/wip-46896-octopus
X-Git-Tag: v15.2.5~77
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a99c6cf9e8b5980f01b5be9ff13976c10a8a2f9d;p=ceph.git

Merge pull request #36563 from s0nea/wip-46896-octopus

octopus: mgr/dashboard: fix tasks.mgr.dashboard.test_rbd.RbdTest.test_move_image_to_trash error

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
---

a99c6cf9e8b5980f01b5be9ff13976c10a8a2f9d