From: Sage Weil <sage@newdream.net>
Date: Thu, 18 Mar 2021 15:30:58 +0000 (-0500)
Subject: Merge PR #40195 into pacific
X-Git-Tag: v16.2.0~96
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=21b88e4c315e91c2740bc2fe201c58883ca64e99;p=ceph.git

Merge PR #40195 into pacific

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

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

21b88e4c315e91c2740bc2fe201c58883ca64e99