From: Yuri Weinstein <yweinste@redhat.com>
Date: Mon, 4 May 2020 20:11:51 +0000 (-0700)
Subject: Merge pull request #34807 from smithfarm/wip-44842-octopus
X-Git-Tag: v15.2.2~33
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f32909aa0ac99fc9abbcd60c498dffd7fa7ad4e9;p=ceph.git

Merge pull request #34807 from smithfarm/wip-44842-octopus

octopus: 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>
---

f32909aa0ac99fc9abbcd60c498dffd7fa7ad4e9