Merge PR #24112 into master

author Sage Weil <sage@redhat.com>

Tue, 18 Sep 2018 16:57:27 +0000 (11:57 -0500)

committer Sage Weil <sage@redhat.com>

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