Merge PR #24006 into master

author Sage Weil <sage@redhat.com>

Tue, 11 Sep 2018 14:27:34 +0000 (09:27 -0500)

committer Sage Weil <sage@redhat.com>

Tue, 11 Sep 2018 14:27:34 +0000 (09:27 -0500)
author Sage Weil <sage@redhat.com>
Tue, 11 Sep 2018 14:27:34 +0000 (09:27 -0500)
committer Sage Weil <sage@redhat.com>
Tue, 11 Sep 2018 14:27:34 +0000 (09:27 -0500)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Tue, 11 Sep 2018 14:27:34 +0000 (09:27 -0500)
committer	Sage Weil <sage@redhat.com>
	Tue, 11 Sep 2018 14:27:34 +0000 (09:27 -0500)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history