]> 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: 5822606 7ebc553)
Merge pull request #30528 from smithfarm/wip-42014-nautilus
authorYuri Weinstein <yweinste@redhat.com>
Wed, 13 Nov 2019 20:09:26 +0000 (12:09 -0800)
committerGitHub <noreply@github.com>
Wed, 13 Nov 2019 20:09:26 +0000 (12:09 -0800)
nautilus: core: osd/PeeringState: recover_got - add special handler for empty log and improvements to standalone tests

1  2 
qa/standalone/ceph-helpers.sh patch | diff1 | diff2 | blob | history
qa/standalone/scrub/osd-scrub-repair.sh patch | diff1 | diff2 | blob | history
src/osd/PrimaryLogPG.cc patch | diff1 | diff2 | blob | history

diff --cc qa/standalone/ceph-helpers.sh
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.