]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #18354 from kungf/no_scurb_deadline
authorSage Weil <sage@newdream.net>
Fri, 20 Oct 2017 22:22:43 +0000 (17:22 -0500)
committerGitHub <noreply@github.com>
Fri, 20 Oct 2017 22:22:43 +0000 (17:22 -0500)
osd: make scrub no deadline when max interval is zero

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
1  2 
src/osd/OSD.cc

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