From: Sage Weil <sage@redhat.com>
Date: Tue, 16 Jul 2019 15:07:53 +0000 (-0500)
Subject: Merge PR #28839 into master
X-Git-Tag: v15.1.0~2192
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1b46267cf798a5a99e62e7aa482436e609de3f81;p=ceph.git

Merge PR #28839 into master

* refs/pull/28839/head:
	osd: support osd_repair_during_recovery

Reviewed-by: David Zafman <dzafman@redhat.com>
---

1b46267cf798a5a99e62e7aa482436e609de3f81