Merge PR #19342 into master

author Sage Weil <sage@redhat.com>

Wed, 21 Feb 2018 16:23:48 +0000 (10:23 -0600)

committer Sage Weil <sage@redhat.com>

Wed, 21 Feb 2018 16:23:48 +0000 (10:23 -0600)
author Sage Weil <sage@redhat.com>
Wed, 21 Feb 2018 16:23:48 +0000 (10:23 -0600)
committer Sage Weil <sage@redhat.com>
Wed, 21 Feb 2018 16:23:48 +0000 (10:23 -0600)
diff --cc src/common/options.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 21 Feb 2018 16:23:48 +0000 (10:23 -0600)
committer	Sage Weil <sage@redhat.com>
	Wed, 21 Feb 2018 16:23:48 +0000 (10:23 -0600)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history