Merge PR #24654 into master

author Sage Weil <sage@redhat.com>

Sat, 20 Oct 2018 20:39:56 +0000 (15:39 -0500)

committer Sage Weil <sage@redhat.com>

Sat, 20 Oct 2018 20:39:56 +0000 (15:39 -0500)
author Sage Weil <sage@redhat.com>
Sat, 20 Oct 2018 20:39:56 +0000 (15:39 -0500)
committer Sage Weil <sage@redhat.com>
Sat, 20 Oct 2018 20:39:56 +0000 (15:39 -0500)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Sat, 20 Oct 2018 20:39:56 +0000 (15:39 -0500)
committer	Sage Weil <sage@redhat.com>
	Sat, 20 Oct 2018 20:39:56 +0000 (15:39 -0500)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history