]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #34807 from smithfarm/wip-44842-octopus
authorYuri Weinstein <yweinste@redhat.com>
Mon, 4 May 2020 20:11:51 +0000 (13:11 -0700)
committerGitHub <noreply@github.com>
Mon, 4 May 2020 20:11:51 +0000 (13:11 -0700)
commitf32909aa0ac99fc9abbcd60c498dffd7fa7ad4e9
tree1b6365a8cb0f30d908c1c415e971e116084862a9
parenta7ae3b522cc7cfe60fc60094ef0a284f7699a941
parent18a5e33ab34d0a17365f90060c1ae0e7fb0f3bfd
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>