]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec3a825 2e75fb7)
Merge PR #24296 into master
authorSage Weil <sage@redhat.com>
Fri, 12 Oct 2018 21:16:39 +0000 (16:16 -0500)
committerSage Weil <sage@redhat.com>
Fri, 12 Oct 2018 21:16:39 +0000 (16:16 -0500)
* refs/pull/24296/head:
osd: Handle is_stopping() by discarding item so it doesn't loop
osd: Simplify _process() logic recently added

Reviewed-by: Jianpeng Ma <jianpeng.ma@intel.com>
Reviewed-by: Sage Weil <sage@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.