]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #40652 from ronen-fr/wip-ronenf-cscrub-class
authorKefu Chai <kchai@redhat.com>
Sat, 5 Jun 2021 16:06:32 +0000 (00:06 +0800)
committerGitHub <noreply@github.com>
Sat, 5 Jun 2021 16:06:32 +0000 (00:06 +0800)
osd/scrub: modify "classic" OSD scrub state-machine to support Crimson

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/osd/OSD.cc
src/osd/OSD.h

diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge