From: Sage Weil <sage@newdream.net>
Date: Mon, 15 Mar 2021 22:41:20 +0000 (-0500)
Subject: Merge PR #40077 into pacific
X-Git-Tag: v16.2.0~109
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c66120a558d5445b1aa25b23fc7496469136b110;p=ceph.git

Merge PR #40077 into pacific

* refs/pull/40077/head:
	test: Add test for scrub parallelism
	osd: Try other PGs when reservation failures occur

Reviewed-by: Neha Ojha <nojha@redhat.com>
---

c66120a558d5445b1aa25b23fc7496469136b110