]> 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: 9692aa0 cdefc53)
Merge pull request #30280 from smithfarm/wip-41640-nautilus
authorYuri Weinstein <yweinste@redhat.com>
Wed, 13 Nov 2019 20:05:56 +0000 (12:05 -0800)
committerGitHub <noreply@github.com>
Wed, 13 Nov 2019 20:05:56 +0000 (12:05 -0800)
nautilus: osd/PeeringState: fix wrong history of merge target

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
1  2 
src/osd/PG.cc patch | diff1 | diff2 | blob | history

diff --cc src/osd/PG.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.