Merge pull request #52545 from Matan-B/wip-matanb-trim-61962

author Yuri Weinstein <yweinste@redhat.com>

Wed, 1 Nov 2023 19:09:44 +0000 (12:09 -0700)

committer GitHub <noreply@github.com>

Wed, 1 Nov 2023 19:09:44 +0000 (12:09 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 1 Nov 2023 19:09:44 +0000 (12:09 -0700)
committer GitHub <noreply@github.com>
Wed, 1 Nov 2023 19:09:44 +0000 (12:09 -0700)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 1 Nov 2023 19:09:44 +0000 (12:09 -0700)
committer	GitHub <noreply@github.com>
	Wed, 1 Nov 2023 19:09:44 +0000 (12:09 -0700)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history