]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #17039 from dzafman/wip-18206
authorKefu Chai <tchaikov@gmail.com>
Tue, 22 Aug 2017 14:50:24 +0000 (22:50 +0800)
committerGitHub <noreply@github.com>
Tue, 22 Aug 2017 14:50:24 +0000 (22:50 +0800)
osd: Fixes for osd_scrub_during_recovery handling

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/osd/OSD.cc

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