Merge pull request #22268 from xiaoxichen/backport_22243_mimic

author Kefu Chai <tchaikov@gmail.com>

Tue, 10 Jul 2018 12:41:50 +0000 (20:41 +0800)

committer GitHub <noreply@github.com>

Tue, 10 Jul 2018 12:41:50 +0000 (20:41 +0800)
author Kefu Chai <tchaikov@gmail.com>
Tue, 10 Jul 2018 12:41:50 +0000 (20:41 +0800)
committer GitHub <noreply@github.com>
Tue, 10 Jul 2018 12:41:50 +0000 (20:41 +0800)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/mon/OSDMonitor.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Tue, 10 Jul 2018 12:41:50 +0000 (20:41 +0800)
committer	GitHub <noreply@github.com>
	Tue, 10 Jul 2018 12:41:50 +0000 (20:41 +0800)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.h	patch \|	diff1 \|	diff2 \|	blob \| history