From: Neha Ojha <nojha@redhat.com>
Date: Fri, 24 Jul 2020 21:47:44 +0000 (-0700)
Subject: Merge pull request #35909 from dzafman/wip-46275
X-Git-Tag: wip-pdonnell-testing-20200918.022351~568
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d1a801e7d5bac4ea6e2c3bd893b6f24b373e5888;p=ceph-ci.git

Merge pull request #35909 from dzafman/wip-46275

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

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

d1a801e7d5bac4ea6e2c3bd893b6f24b373e5888