Merge pull request #28142 from pdvian/wip-39422-mimic

author Yuri Weinstein <yweinste@redhat.com>

Wed, 17 Jul 2019 22:14:53 +0000 (15:14 -0700)

committer GitHub <noreply@github.com>

Wed, 17 Jul 2019 22:14:53 +0000 (15:14 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 17 Jul 2019 22:14:53 +0000 (15:14 -0700)
committer GitHub <noreply@github.com>
Wed, 17 Jul 2019 22:14:53 +0000 (15:14 -0700)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/OSDMap.cc
Simple merge
diff --cc src/osd/OSDMap.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 17 Jul 2019 22:14:53 +0000 (15:14 -0700)
committer	GitHub <noreply@github.com>
	Wed, 17 Jul 2019 22:14:53 +0000 (15:14 -0700)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.h	patch \|	diff1 \|	diff2 \|	blob \| history