Merge pull request #31992 from dzafman/wip-balancer3-luminous

author Yuri Weinstein <yweinste@redhat.com>

Thu, 12 Dec 2019 16:40:45 +0000 (08:40 -0800)

committer GitHub <noreply@github.com>

Thu, 12 Dec 2019 16:40:45 +0000 (08:40 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Thu, 12 Dec 2019 16:40:45 +0000 (08:40 -0800)
committer GitHub <noreply@github.com>
Thu, 12 Dec 2019 16:40:45 +0000 (08:40 -0800)
diff --cc src/crush/CrushWrapper.cc
Simple merge
diff --cc src/test/osd/TestOSDMap.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Thu, 12 Dec 2019 16:40:45 +0000 (08:40 -0800)
committer	GitHub <noreply@github.com>
	Thu, 12 Dec 2019 16:40:45 +0000 (08:40 -0800)
		1	2
src/crush/CrushWrapper.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/osd/TestOSDMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history