]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitdf3818e77c65ad679c9c653653d3915f94579306
treef561eee2e235c56bfcafe2e97aa11127160d501dtree | snapshot
parent0dc74ee02739e7263ff381cd0a78e2b4bc229773commit | diff
parent0b63c850a251f75bcb7436efefe4f24480c4ed7ecommit | diff
Merge PR #39535 into master

* 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>
Unnamed repository; edit this file 'description' to name the repository.