]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a7ae3b5 18a5e33)
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)
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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.