Merge pull request #24647 from liewegas/wip-pr-23273-mimic

author Yuri Weinstein <yweinste@redhat.com>

Mon, 29 Oct 2018 20:09:47 +0000 (16:09 -0400)

committer GitHub <noreply@github.com>

Mon, 29 Oct 2018 20:09:47 +0000 (16:09 -0400)
author Yuri Weinstein <yweinste@redhat.com>
Mon, 29 Oct 2018 20:09:47 +0000 (16:09 -0400)
committer GitHub <noreply@github.com>
Mon, 29 Oct 2018 20:09:47 +0000 (16:09 -0400)
diff --cc src/common/options.cc
Simple merge
diff --cc src/test/objectstore/store_test.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Mon, 29 Oct 2018 20:09:47 +0000 (16:09 -0400)
committer	GitHub <noreply@github.com>
	Mon, 29 Oct 2018 20:09:47 +0000 (16:09 -0400)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/objectstore/store_test.cc	patch \|	diff1 \|	diff2 \|	blob \| history