]> 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: d5ad57c eace76d)
Merge pull request #7009 from majianpeng/osd-scrub-sleep-cause-thread-suicide
authorSage Weil <sage@redhat.com>
Sun, 3 Jan 2016 18:19:10 +0000 (13:19 -0500)
committerSage Weil <sage@redhat.com>
Sun, 3 Jan 2016 18:19:10 +0000 (13:19 -0500)
osd: avoid osd_op_thread suicide because osd_scrub_sleep

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/PG.cc patch | diff1 | diff2 | blob | history

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