From: Kefu Chai <kchai@redhat.com>
Date: Wed, 17 Jun 2020 11:41:07 +0000 (+0800)
Subject: Merge pull request #35558 from xiexingguo/wip-45991
X-Git-Tag: v16.1.0~2044
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ce0d96badf169e11bc1233d76f3ba88a69be651a;p=ceph.git

Merge pull request #35558 from xiexingguo/wip-45991

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

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

ce0d96badf169e11bc1233d76f3ba88a69be651a