Merge pull request #49507 from Matan-B/wip-matanb-check_pg_num-edit

author Yuri Weinstein <yweinste@redhat.com>

Mon, 27 Feb 2023 19:56:00 +0000 (11:56 -0800)

committer GitHub <noreply@github.com>

Mon, 27 Feb 2023 19:56:00 +0000 (11:56 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Mon, 27 Feb 2023 19:56:00 +0000 (11:56 -0800)
committer GitHub <noreply@github.com>
Mon, 27 Feb 2023 19:56:00 +0000 (11:56 -0800)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/mon/OSDMonitor.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Mon, 27 Feb 2023 19:56:00 +0000 (11:56 -0800)
committer	GitHub <noreply@github.com>
	Mon, 27 Feb 2023 19:56:00 +0000 (11:56 -0800)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.h	patch \|	diff1 \|	diff2 \|	blob \| history