]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0dc74ee 0b63c85)
Merge PR #39535 into master
authorSage Weil <sage@newdream.net>
Sun, 21 Feb 2021 16:48:25 +0000 (11:48 -0500)
committerSage Weil <sage@newdream.net>
Sun, 21 Feb 2021 16:48:25 +0000 (11:48 -0500)
* refs/pull/39535/head:
osd: Don't clear m_planned_scrub until scrub finishes successfully

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.