Merge pull request #48010 from ljflores/wip-lflores-primary-balancer

author Laura Flores <lflores@redhat.com>

Mon, 27 Feb 2023 23:55:52 +0000 (17:55 -0600)

committer GitHub <noreply@github.com>

Mon, 27 Feb 2023 23:55:52 +0000 (17:55 -0600)
author Laura Flores <lflores@redhat.com>
Mon, 27 Feb 2023 23:55:52 +0000 (17:55 -0600)
committer GitHub <noreply@github.com>
Mon, 27 Feb 2023 23:55:52 +0000 (17:55 -0600)
diff --cc src/osd/OSDMap.cc
Simple merge
diff --cc src/osd/OSDMap.h
Simple merge
author	Laura Flores <lflores@redhat.com>
	Mon, 27 Feb 2023 23:55:52 +0000 (17:55 -0600)
committer	GitHub <noreply@github.com>
	Mon, 27 Feb 2023 23:55:52 +0000 (17:55 -0600)
		1	2
src/osd/OSDMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.h	patch \|	diff1 \|	diff2 \|	blob \| history