From: Yuri Weinstein <yweinste@redhat.com>
Date: Fri, 22 May 2020 18:39:30 +0000 (-0700)
Subject: Merge pull request #34957 from smithfarm/wip-44841-nautilus
X-Git-Tag: v14.2.10~45
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c92420f2daca69ac01c5dbd65ca72708b73fa6ec;p=ceph.git

Merge pull request #34957 from smithfarm/wip-44841-nautilus

nautilus: osd/PeeringState: do not trim pg log past last_update_ondisk

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
---

c92420f2daca69ac01c5dbd65ca72708b73fa6ec