Merge pull request #19480 from smithfarm/wip-22407-luminous

author Yuri Weinstein <yuri.weinstein@gmail.com>

Thu, 25 Jan 2018 19:00:27 +0000 (11:00 -0800)

committer GitHub <noreply@github.com>

Thu, 25 Jan 2018 19:00:27 +0000 (11:00 -0800)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Thu, 25 Jan 2018 19:00:27 +0000 (11:00 -0800)
committer GitHub <noreply@github.com>
Thu, 25 Jan 2018 19:00:27 +0000 (11:00 -0800)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/common/options.cc
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Thu, 25 Jan 2018 19:00:27 +0000 (11:00 -0800)
committer	GitHub <noreply@github.com>
	Thu, 25 Jan 2018 19:00:27 +0000 (11:00 -0800)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/legacy_config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history