]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #21628 from liewegas/wip-23646
authorSage Weil <sage@newdream.net>
Wed, 25 Apr 2018 15:57:48 +0000 (10:57 -0500)
committerGitHub <noreply@github.com>
Wed, 25 Apr 2018 15:57:48 +0000 (10:57 -0500)
osd/PrimaryLogPG: defer evict if head *or* object intersect scrub interval

Reviewed-by: David Zafman <dzafman@redhat.com>
1  2 
src/osd/PG.cc

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