From: Kefu Chai <kchai@redhat.com>
Date: Sun, 4 Oct 2020 04:27:36 +0000 (+0800)
Subject: Merge pull request #34906 from ErwanAliasr1/patch-1
X-Git-Tag: v16.1.0~936
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ff981063d2bbf759561995b94f88a22361dd62cf;p=ceph.git

Merge pull request #34906 from ErwanAliasr1/patch-1

doc/config: osd_scrub_during_recovery is disabled by default

Reviewed-by: Sébastien Han <seb@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

ff981063d2bbf759561995b94f88a22361dd62cf