From: Sage Weil <sage@redhat.com>
Date: Sat, 12 Nov 2016 13:35:13 +0000 (-0600)
Subject: Merge pull request #11874 from wido/osd-no-scrub-recovery
X-Git-Tag: v11.1.0~316
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9100d3362a9ffdd26afc7ee1962c013931cc9e58;p=ceph.git

Merge pull request #11874 from wido/osd-no-scrub-recovery

osd: Add config option to disable new scrubs during recovery

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

9100d3362a9ffdd26afc7ee1962c013931cc9e58