Merge pull request #35310 from dillaman/wip-librbd-io-image-dispatch

author Mykola Golub <mgolub@suse.com>

Wed, 3 Jun 2020 14:40:26 +0000 (17:40 +0300)

committer GitHub <noreply@github.com>

Wed, 3 Jun 2020 14:40:26 +0000 (17:40 +0300)
author Mykola Golub <mgolub@suse.com>
Wed, 3 Jun 2020 14:40:26 +0000 (17:40 +0300)
committer GitHub <noreply@github.com>
Wed, 3 Jun 2020 14:40:26 +0000 (17:40 +0300)
diff --cc src/librbd/CMakeLists.txt
Simple merge
diff --cc src/librbd/io/ImageDispatcher.cc
Simple merge
diff --cc src/librbd/io/ImageDispatcher.h
Simple merge
author	Mykola Golub <mgolub@suse.com>
	Wed, 3 Jun 2020 14:40:26 +0000 (17:40 +0300)
committer	GitHub <noreply@github.com>
	Wed, 3 Jun 2020 14:40:26 +0000 (17:40 +0300)
		1	2
src/librbd/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/io/ImageDispatcher.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/io/ImageDispatcher.h	patch \|	diff1 \|	diff2 \|	blob \| history