From: Yuri Weinstein <yweinste@redhat.com>
Date: Mon, 10 Aug 2020 17:18:14 +0000 (-0700)
Subject: Merge pull request #36291 from dzafman/wip-46707-octopus
X-Git-Tag: v15.2.5~84
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a2c6ab9afe985d57521e70583acd97fccdfa8fb1;p=ceph.git

Merge pull request #36291 from dzafman/wip-46707-octopus

octopus: osd: Cancel in-progress scrubs (not user requested)

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

a2c6ab9afe985d57521e70583acd97fccdfa8fb1