From: Samuel Just <sam.just@inktank.com>
Date: Mon, 22 Jun 2015 22:17:46 +0000 (-0700)
Subject: Merge pull request #3973 from XinzeChi/wip-scrub-pending
X-Git-Tag: v9.0.3~137
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f4391a905ef3a8ac3f3a2be65723cd34f0901b61;p=ceph.git

Merge pull request #3973 from XinzeChi/wip-scrub-pending

osd: check pending or active scrub before sched_scrub

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

f4391a905ef3a8ac3f3a2be65723cd34f0901b61