Merge pull request #50552 from rzarzynski/wip-59085-pacific

author Yuri Weinstein <yweinste@redhat.com>

Tue, 28 Nov 2023 15:59:51 +0000 (07:59 -0800)

committer GitHub <noreply@github.com>

Tue, 28 Nov 2023 15:59:51 +0000 (07:59 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Tue, 28 Nov 2023 15:59:51 +0000 (07:59 -0800)
committer GitHub <noreply@github.com>
Tue, 28 Nov 2023 15:59:51 +0000 (07:59 -0800)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Tue, 28 Nov 2023 15:59:51 +0000 (07:59 -0800)
committer	GitHub <noreply@github.com>
	Tue, 28 Nov 2023 15:59:51 +0000 (07:59 -0800)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history