From: Sage Weil <sage@redhat.com>
Date: Fri, 11 Nov 2016 15:49:56 +0000 (-0600)
Subject: Merge pull request #1248 from ceph/scrub-vs-recovery
X-Git-Tag: v11.1.1~58^2^2~48
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7f13fe264febfd783cd4a5fea0dec2d6ab385580;p=ceph.git

Merge pull request #1248 from ceph/scrub-vs-recovery

rados/thrash: test osd_scrub_during_recovery=false
---

7f13fe264febfd783cd4a5fea0dec2d6ab385580