]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #25112 from dzafman/wip-scrub-warning
authorDavid Zafman <dzafman@redhat.com>
Mon, 28 Jan 2019 18:46:18 +0000 (10:46 -0800)
committerGitHub <noreply@github.com>
Mon, 28 Jan 2019 18:46:18 +0000 (10:46 -0800)
scrub warning check incorrectly uses mon scrub interval

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
PendingReleaseNotes
src/common/legacy_config_opts.h
src/common/options.cc
src/osd/OSD.cc
src/osd/PG.cc
src/osd/PG.h

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