From: Sage Weil <sage@redhat.com>
Date: Mon, 5 Dec 2016 19:01:03 +0000 (-0500)
Subject: Merge pull request #11944 from SUSE/wip-17866-jewel
X-Git-Tag: v10.2.6~30^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a9539648ea6ff31c099f08881aecbaa3063e6a7a;p=ceph.git

Merge pull request #11944 from SUSE/wip-17866-jewel

jewel: osd: Add config option to disable new scrubs during recovery

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

a9539648ea6ff31c099f08881aecbaa3063e6a7a