From: Sage Weil <sage@redhat.com>
Date: Fri, 15 Apr 2016 21:11:51 +0000 (-0400)
Subject: Merge pull request #8570 from xiexingguo/xxg-wip-scrub
X-Git-Tag: v10.2.0~23
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1f75dee1b374153a38e630c7de7a4f983636eccc;p=ceph.git

Merge pull request #8570 from xiexingguo/xxg-wip-scrub

osd: clear requeue_scrub_on_unblock flag after requeue scrub

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

1f75dee1b374153a38e630c7de7a4f983636eccc