From: Sage Weil <sage@redhat.com>
Date: Wed, 6 Jan 2016 14:41:28 +0000 (-0500)
Subject: Merge pull request #7065 from majianpeng/osd-recover-sleep-cause-thread-suicide
X-Git-Tag: v10.0.3~129
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b46714f30c5ddc666cacb6d508ca59bbd9ee31e2;p=ceph.git

Merge pull request #7065 from majianpeng/osd-recover-sleep-cause-thread-suicide

osd: prevent osd_recovery_sleep from causing recovery-thread suicide

Reviewed-by: Sage Weli <sage@redhat.com>
---

b46714f30c5ddc666cacb6d508ca59bbd9ee31e2