Merge pull request #38501 from tchaikov/wip-cmake-crimson-test

author Kefu Chai <kchai@redhat.com>

Fri, 11 Dec 2020 07:52:22 +0000 (15:52 +0800)

committer GitHub <noreply@github.com>

Fri, 11 Dec 2020 07:52:22 +0000 (15:52 +0800)
author Kefu Chai <kchai@redhat.com>
Fri, 11 Dec 2020 07:52:22 +0000 (15:52 +0800)
committer GitHub <noreply@github.com>
Fri, 11 Dec 2020 07:52:22 +0000 (15:52 +0800)
diff --cc src/common/options.cc
Simple merge
diff --cc src/tools/immutable_object_cache/CacheClient.cc
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Fri, 11 Dec 2020 07:52:22 +0000 (15:52 +0800)
committer	GitHub <noreply@github.com>
	Fri, 11 Dec 2020 07:52:22 +0000 (15:52 +0800)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/immutable_object_cache/CacheClient.cc	patch \|	diff1 \|	diff2 \|	blob \| history