Merge pull request #28452 from thmour/mimic_test

author Yuri Weinstein <yweinste@redhat.com>

Tue, 29 Oct 2019 19:36:53 +0000 (12:36 -0700)

committer GitHub <noreply@github.com>

Tue, 29 Oct 2019 19:36:53 +0000 (12:36 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Tue, 29 Oct 2019 19:36:53 +0000 (12:36 -0700)
committer GitHub <noreply@github.com>
Tue, 29 Oct 2019 19:36:53 +0000 (12:36 -0700)
diff --cc PendingReleaseNotes
Simple merge
diff --cc src/common/options.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Tue, 29 Oct 2019 19:36:53 +0000 (12:36 -0700)
committer	GitHub <noreply@github.com>
	Tue, 29 Oct 2019 19:36:53 +0000 (12:36 -0700)
		1	2
PendingReleaseNotes	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history