From: Kefu Chai Date: Wed, 25 Oct 2017 11:18:50 +0000 (+0800) Subject: Merge pull request #18506 from majianpeng/osd-scrub X-Git-Tag: v13.0.1~426 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=022f08362e2b1a2bfcc2eeac3222203e49eab8cc;p=ceph.git Merge pull request #18506 from majianpeng/osd-scrub osd/PrimaryLogPG: add condition "is_chunky_scrub_active" to check object in chunky_scrub Reviewed-by: xie xingguo --- 022f08362e2b1a2bfcc2eeac3222203e49eab8cc