Merge pull request #25045 from tchaikov/wip-36219-mimic

author Yuri Weinstein <yweinste@redhat.com>

Mon, 26 Nov 2018 20:49:48 +0000 (12:49 -0800)

committer GitHub <noreply@github.com>

Mon, 26 Nov 2018 20:49:48 +0000 (12:49 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Mon, 26 Nov 2018 20:49:48 +0000 (12:49 -0800)
committer GitHub <noreply@github.com>
Mon, 26 Nov 2018 20:49:48 +0000 (12:49 -0800)
diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/common/options.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Mon, 26 Nov 2018 20:49:48 +0000 (12:49 -0800)
committer	GitHub <noreply@github.com>
	Mon, 26 Nov 2018 20:49:48 +0000 (12:49 -0800)
		1	2
src/common/legacy_config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history