Merge pull request #30653 from tchaikov/wip-os/drop-kinetic

author Kefu Chai <kchai@redhat.com>

Wed, 2 Oct 2019 02:16:58 +0000 (10:16 +0800)

committer GitHub <noreply@github.com>

Wed, 2 Oct 2019 02:16:58 +0000 (10:16 +0800)
author Kefu Chai <kchai@redhat.com>
Wed, 2 Oct 2019 02:16:58 +0000 (10:16 +0800)
committer GitHub <noreply@github.com>
Wed, 2 Oct 2019 02:16:58 +0000 (10:16 +0800)
diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/common/options.cc
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Wed, 2 Oct 2019 02:16:58 +0000 (10:16 +0800)
committer	GitHub <noreply@github.com>
	Wed, 2 Oct 2019 02:16:58 +0000 (10:16 +0800)
		1	2
src/common/legacy_config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history