]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit718802b03a6313584cb21107dc5ba9be124b1125
tree8eda236a5e2aa503c6ef8b732e64b0cb7be53a2atree | snapshot
parent9692aa0e1d0487f06f6edf8ec72b3a296959eac3commit | diff
parentcdefc53d82937c441e0500be2926fe9c62d97bf5commit | diff
Merge pull request #30280 from smithfarm/wip-41640-nautilus

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>
src/osd/PG.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.