Merge PR #30220 into master

author Sage Weil <sage@redhat.com>

Mon, 9 Sep 2019 16:09:04 +0000 (11:09 -0500)

committer Sage Weil <sage@redhat.com>

Mon, 9 Sep 2019 16:09:04 +0000 (11:09 -0500)
author Sage Weil <sage@redhat.com>
Mon, 9 Sep 2019 16:09:04 +0000 (11:09 -0500)
committer Sage Weil <sage@redhat.com>
Mon, 9 Sep 2019 16:09:04 +0000 (11:09 -0500)
diff --cc src/common/options.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Mon, 9 Sep 2019 16:09:04 +0000 (11:09 -0500)
committer	Sage Weil <sage@redhat.com>
	Mon, 9 Sep 2019 16:09:04 +0000 (11:09 -0500)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history