Merge pull request #22269 from xiaoxichen/backport_22243

author Yuri Weinstein <yweinste@redhat.com>

Fri, 22 Jun 2018 16:23:50 +0000 (09:23 -0700)

committer GitHub <noreply@github.com>

Fri, 22 Jun 2018 16:23:50 +0000 (09:23 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Fri, 22 Jun 2018 16:23:50 +0000 (09:23 -0700)
committer GitHub <noreply@github.com>
Fri, 22 Jun 2018 16:23:50 +0000 (09:23 -0700)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/mon/OSDMonitor.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Fri, 22 Jun 2018 16:23:50 +0000 (09:23 -0700)
committer	GitHub <noreply@github.com>
	Fri, 22 Jun 2018 16:23:50 +0000 (09:23 -0700)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.h	patch \|	diff1 \|	diff2 \|	blob \| history