Merge pull request #36955 from agayev/zbc-to-zbd

author Kefu Chai <kchai@redhat.com>

Tue, 8 Sep 2020 13:24:11 +0000 (21:24 +0800)

committer GitHub <noreply@github.com>

Tue, 8 Sep 2020 13:24:11 +0000 (21:24 +0800)
author Kefu Chai <kchai@redhat.com>
Tue, 8 Sep 2020 13:24:11 +0000 (21:24 +0800)
committer GitHub <noreply@github.com>
Tue, 8 Sep 2020 13:24:11 +0000 (21:24 +0800)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/include/config-h.in.cmake
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Tue, 8 Sep 2020 13:24:11 +0000 (21:24 +0800)
committer	GitHub <noreply@github.com>
	Tue, 8 Sep 2020 13:24:11 +0000 (21:24 +0800)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/include/config-h.in.cmake	patch \|	diff1 \|	diff2 \|	blob \| history