]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 90c1645 abd3090)
Merge pull request #34957 from smithfarm/wip-44841-nautilus
authorYuri Weinstein <yweinste@redhat.com>
Fri, 22 May 2020 18:39:30 +0000 (11:39 -0700)
committerGitHub <noreply@github.com>
Fri, 22 May 2020 18:39:30 +0000 (11:39 -0700)
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>

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