From: Yuri Weinstein <yweinste@redhat.com>
Date: Tue, 14 Jul 2020 16:18:26 +0000 (-0700)
Subject: Merge pull request #36033 from smithfarm/wip-46089-octopus
X-Git-Tag: v15.2.5~143
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c19802e8fce1703874765936ca94d7a361f070ec;p=ceph.git

Merge pull request #36033 from smithfarm/wip-46089-octopus

octopus: osd/PG: fix history.same_interval_since of merge target again

Reviewed-by: Neha Ojha <nojha@redhat.com>
---

c19802e8fce1703874765936ca94d7a361f070ec