Merge pull request #17863 from smithfarm/wip-21343-luminous

author Sage Weil <sage@newdream.net>

Thu, 19 Oct 2017 21:41:34 +0000 (16:41 -0500)

committer GitHub <noreply@github.com>

Thu, 19 Oct 2017 21:41:34 +0000 (16:41 -0500)
author Sage Weil <sage@newdream.net>
Thu, 19 Oct 2017 21:41:34 +0000 (16:41 -0500)
committer GitHub <noreply@github.com>
Thu, 19 Oct 2017 21:41:34 +0000 (16:41 -0500)
diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/common/options.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Thu, 19 Oct 2017 21:41:34 +0000 (16:41 -0500)
committer	GitHub <noreply@github.com>
	Thu, 19 Oct 2017 21:41:34 +0000 (16:41 -0500)
		1	2
src/common/legacy_config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history