]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 237a23e 9f35081)
Merge PR #25399 into master
authorSage Weil <sage@redhat.com>
Thu, 6 Dec 2018 23:22:23 +0000 (17:22 -0600)
committerSage Weil <sage@redhat.com>
Thu, 6 Dec 2018 23:22:23 +0000 (17:22 -0600)
* refs/pull/25399/head:
osd: requeue waiting peering events from deleted slots in unprime_split_children

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/osd/OSD.cc patch | diff1 | diff2 | blob | history

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