Merge PR #26187 into master

author Sage Weil <sage@redhat.com>

Sat, 16 Feb 2019 15:39:59 +0000 (09:39 -0600)

committer Sage Weil <sage@redhat.com>

Sat, 16 Feb 2019 15:39:59 +0000 (09:39 -0600)
author Sage Weil <sage@redhat.com>
Sat, 16 Feb 2019 15:39:59 +0000 (09:39 -0600)
committer Sage Weil <sage@redhat.com>
Sat, 16 Feb 2019 15:39:59 +0000 (09:39 -0600)
diff --cc src/common/options.cc
Simple merge
diff --cc src/osd/OSDMap.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Sat, 16 Feb 2019 15:39:59 +0000 (09:39 -0600)
committer	Sage Weil <sage@redhat.com>
	Sat, 16 Feb 2019 15:39:59 +0000 (09:39 -0600)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history