From: Yuri Weinstein <yweinste@redhat.com>
Date: Tue, 28 Jul 2020 17:34:07 +0000 (-0700)
Subject: Merge pull request #36161 from smithfarm/wip-46090-nautilus
X-Git-Tag: v14.2.11~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=49b8c8cf7598a082e236d38d48abbbc01a64ac9d;p=ceph.git

Merge pull request #36161 from smithfarm/wip-46090-nautilus

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

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>
---

49b8c8cf7598a082e236d38d48abbbc01a64ac9d