]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #7065 from majianpeng/osd-recover-sleep-cause-thread-suicide
authorSage Weil <sage@redhat.com>
Wed, 6 Jan 2016 14:41:28 +0000 (09:41 -0500)
committerSage Weil <sage@redhat.com>
Wed, 6 Jan 2016 14:41:28 +0000 (09:41 -0500)
osd: prevent osd_recovery_sleep from causing recovery-thread suicide

Reviewed-by: Sage Weli <sage@redhat.com>
1  2 
src/osd/OSD.cc

diff --cc src/osd/OSD.cc
Simple merge