Merge pull request #38068 from dillaman/wip-librbd-migration-4

author Mykola Golub <mgolub@suse.com>

Wed, 25 Nov 2020 15:30:54 +0000 (17:30 +0200)

committer GitHub <noreply@github.com>

Wed, 25 Nov 2020 15:30:54 +0000 (17:30 +0200)
author Mykola Golub <mgolub@suse.com>
Wed, 25 Nov 2020 15:30:54 +0000 (17:30 +0200)
committer GitHub <noreply@github.com>
Wed, 25 Nov 2020 15:30:54 +0000 (17:30 +0200)
diff --cc src/librbd/CMakeLists.txt
Simple merge
diff --cc src/test/librbd/CMakeLists.txt
Simple merge
author	Mykola Golub <mgolub@suse.com>
	Wed, 25 Nov 2020 15:30:54 +0000 (17:30 +0200)
committer	GitHub <noreply@github.com>
	Wed, 25 Nov 2020 15:30:54 +0000 (17:30 +0200)
		1	2
src/librbd/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/librbd/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history