From: Yuri Weinstein <yweinste@redhat.com>
Date: Thu, 1 Apr 2021 15:50:27 +0000 (-0700)
Subject: Merge pull request #40278 from singuliere/wip-48596-octopus
X-Git-Tag: v15.2.13~13^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e1aa5ee41c7f5ee0841f7b11c5b5ac01e630edcd;p=ceph.git

Merge pull request #40278 from singuliere/wip-48596-octopus

octopus: test: cancelling both noscrub *and* nodeep-scrub

Reviewed-by: Neha Ojha <nojha@redhat.com>
---

e1aa5ee41c7f5ee0841f7b11c5b5ac01e630edcd