Merge pull request #17471 from smithfarm/wip-21107-luminous

author Abhishek L <abhishek.lekshmanan@gmail.com>

Thu, 14 Sep 2017 08:25:51 +0000 (10:25 +0200)

committer GitHub <noreply@github.com>

Thu, 14 Sep 2017 08:25:51 +0000 (10:25 +0200)
author Abhishek L <abhishek.lekshmanan@gmail.com>
Thu, 14 Sep 2017 08:25:51 +0000 (10:25 +0200)
committer GitHub <noreply@github.com>
Thu, 14 Sep 2017 08:25:51 +0000 (10:25 +0200)
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	Abhishek L <abhishek.lekshmanan@gmail.com>
	Thu, 14 Sep 2017 08:25:51 +0000 (10:25 +0200)
committer	GitHub <noreply@github.com>
	Thu, 14 Sep 2017 08:25:51 +0000 (10:25 +0200)
		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