]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitc1d757a7c6421f8df17624c78dad8c7493fb2511
tree1bc0c5938e898b8f4fbcf4b44381b231ac899757tree | snapshot
parent237a23eb296005a440f96efb19ff41e4b2b5f7e1commit | diff
parent9f35081ae2bb485b8100d3b6e9ac5a92f1663471commit | diff
Merge PR #25399 into master

* refs/pull/25399/head:
osd: requeue waiting peering events from deleted slots in unprime_split_children

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
src/osd/OSD.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.