From: Sage Weil <sage@newdream.net>
Date: Wed, 25 Apr 2018 15:57:48 +0000 (-0500)
Subject: Merge pull request #21628 from liewegas/wip-23646
X-Git-Tag: v13.1.0~102
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=60958b32d54ad5640885aa0aa5275f04c2a4e95f;p=ceph-ci.git

Merge pull request #21628 from liewegas/wip-23646

osd/PrimaryLogPG: defer evict if head *or* object intersect scrub interval

Reviewed-by: David Zafman <dzafman@redhat.com>
---

60958b32d54ad5640885aa0aa5275f04c2a4e95f