From: Sage Weil <sage@redhat.com>
Date: Sun, 3 Jan 2016 18:19:10 +0000 (-0500)
Subject: Merge pull request #7009 from majianpeng/osd-scrub-sleep-cause-thread-suicide
X-Git-Tag: v10.0.3~149
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=62c584fba2d072c8540aaa9838f8f3489d91a683;p=ceph.git

Merge pull request #7009 from majianpeng/osd-scrub-sleep-cause-thread-suicide

osd: avoid osd_op_thread suicide because osd_scrub_sleep

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

62c584fba2d072c8540aaa9838f8f3489d91a683