]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #39597 into pacific
authorSage Weil <sage@newdream.net>
Thu, 4 Mar 2021 18:46:18 +0000 (12:46 -0600)
committerSage Weil <sage@newdream.net>
Thu, 4 Mar 2021 18:46:18 +0000 (12:46 -0600)
* refs/pull/39597/head:
osd: Don't clear m_planned_scrub until scrub finishes successfully

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>

Trivial merge