Merge pull request #36158 from dillaman/wip-45169

author Mykola Golub <mgolub@suse.com>

Thu, 23 Jul 2020 06:05:23 +0000 (09:05 +0300)

committer GitHub <noreply@github.com>

Thu, 23 Jul 2020 06:05:23 +0000 (09:05 +0300)
author Mykola Golub <mgolub@suse.com>
Thu, 23 Jul 2020 06:05:23 +0000 (09:05 +0300)
committer GitHub <noreply@github.com>
Thu, 23 Jul 2020 06:05:23 +0000 (09:05 +0300)
diff --cc src/common/options.cc
Simple merge
diff --cc src/tools/immutable_object_cache/CacheServer.cc
Simple merge
author	Mykola Golub <mgolub@suse.com>
	Thu, 23 Jul 2020 06:05:23 +0000 (09:05 +0300)
committer	GitHub <noreply@github.com>
	Thu, 23 Jul 2020 06:05:23 +0000 (09:05 +0300)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/immutable_object_cache/CacheServer.cc	patch \|	diff1 \|	diff2 \|	blob \| history