From: Neha Ojha <nojha@redhat.com>
Date: Wed, 26 Aug 2020 22:17:43 +0000 (-0700)
Subject: Merge pull request #36661 from smithfarm/wip-46586-octopus
X-Git-Tag: v15.2.5~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=027d6effac1b1ff8dcb93c0f8603c3bbc1fbccb6;p=ceph.git

Merge pull request #36661 from smithfarm/wip-46586-octopus

octopus: doc/rados: Fix osd_scrub_during_recovery default value

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
---

027d6effac1b1ff8dcb93c0f8603c3bbc1fbccb6