]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #40195 into pacific
authorSage Weil <sage@newdream.net>
Thu, 18 Mar 2021 15:30:58 +0000 (10:30 -0500)
committerSage Weil <sage@newdream.net>
Thu, 18 Mar 2021 15:30:58 +0000 (10:30 -0500)
* 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>

Trivial merge