Merge pull request #46764 from Matan-B/wip-matanb-osd-cleanup

author Yuri Weinstein <yweinste@redhat.com>

Tue, 12 Jul 2022 13:35:13 +0000 (06:35 -0700)

committer GitHub <noreply@github.com>

Tue, 12 Jul 2022 13:35:13 +0000 (06:35 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Tue, 12 Jul 2022 13:35:13 +0000 (06:35 -0700)
committer GitHub <noreply@github.com>
Tue, 12 Jul 2022 13:35:13 +0000 (06:35 -0700)
diff --cc src/mgr/DaemonServer.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
diff --cc src/osd/scrubber/pg_scrubber.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Tue, 12 Jul 2022 13:35:13 +0000 (06:35 -0700)
committer	GitHub <noreply@github.com>
	Tue, 12 Jul 2022 13:35:13 +0000 (06:35 -0700)
		1	2
src/mgr/DaemonServer.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/scrubber/pg_scrubber.cc	patch \|	diff1 \|	diff2 \|	blob \| history