]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #29342 from Jeegn-Chen/wip-scrub-extended-sleep
authorKefu Chai <kchai@redhat.com>
Tue, 13 Aug 2019 01:09:52 +0000 (09:09 +0800)
committerGitHub <noreply@github.com>
Tue, 13 Aug 2019 01:09:52 +0000 (09:09 +0800)
osd: support osd_scrub_extended_sleep

Reviewed-by: David Zafman <dzafman@redhat.com>
1  2 
qa/standalone/scrub/osd-scrub-test.sh
src/common/legacy_config_opts.h
src/common/options.cc
src/osd/OSD.cc
src/osd/OSD.h
src/osd/PG.cc

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