]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitb624cea60a2f50085f3b24225d9949481aacf48b
tree16f3b09945281a76a1f53319754782b3474ebebctree | snapshot
parentec3a825db20d6e3e928a3105ffd623deb10fafc2commit | diff
parent2e75fb7d320f0081835cdfebd7572863af5d6af2commit | diff
Merge PR #24296 into master

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