Merge pull request #46643 from ronen-fr/wip-rf-blocked

author Ronen Friedman <rfriedma@redhat.com>

Thu, 23 Jun 2022 15:29:27 +0000 (18:29 +0300)

committer GitHub <noreply@github.com>

Thu, 23 Jun 2022 15:29:27 +0000 (18:29 +0300)
author Ronen Friedman <rfriedma@redhat.com>
Thu, 23 Jun 2022 15:29:27 +0000 (18:29 +0300)
committer GitHub <noreply@github.com>
Thu, 23 Jun 2022 15:29:27 +0000 (18:29 +0300)
diff --cc src/common/options/osd.yaml.in
Simple merge
diff --cc src/osd/scrubber/pg_scrubber.cc
Simple merge
author	Ronen Friedman <rfriedma@redhat.com>
	Thu, 23 Jun 2022 15:29:27 +0000 (18:29 +0300)
committer	GitHub <noreply@github.com>
	Thu, 23 Jun 2022 15:29:27 +0000 (18:29 +0300)
		1	2
src/common/options/osd.yaml.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/scrubber/pg_scrubber.cc	patch \|	diff1 \|	diff2 \|	blob \| history