From: Xie Xingguo <xie.xingguo@zte.com.cn>
Date: Thu, 26 Mar 2020 00:10:22 +0000 (+0800)
Subject: Merge pull request #33910 from xiexingguo/wip-44532-2
X-Git-Tag: v17.0.0~2828
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b7a959c1cfa306c160d15e45f417c59de4ef495e;p=ceph.git

Merge pull request #33910 from xiexingguo/wip-44532-2

osd/PeeringState: do not trim pg log past last_update_ondisk

Reviewed-by: Yan Jun <yan.jun8@zte.com.cn>
Reviewed-by: Samuel Just <sjust@redhat.com>
---

b7a959c1cfa306c160d15e45f417c59de4ef495e