Merge pull request #19076 from jecluis/wip-mon-fix-osdmap-lec-trim

author Kefu Chai <kchai@redhat.com>

Wed, 15 Apr 2020 00:02:51 +0000 (08:02 +0800)

committer GitHub <noreply@github.com>

Wed, 15 Apr 2020 00:02:51 +0000 (08:02 +0800)
author Kefu Chai <kchai@redhat.com>
Wed, 15 Apr 2020 00:02:51 +0000 (08:02 +0800)
committer GitHub <noreply@github.com>
Wed, 15 Apr 2020 00:02:51 +0000 (08:02 +0800)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/mon/OSDMonitor.h
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Wed, 15 Apr 2020 00:02:51 +0000 (08:02 +0800)
committer	GitHub <noreply@github.com>
	Wed, 15 Apr 2020 00:02:51 +0000 (08:02 +0800)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.h	patch \|	diff1 \|	diff2 \|	blob \| history