Merge pull request #37074 from dillaman/wip-librbd-list-snaps-api

author Mykola Golub <mgolub@suse.com>

Tue, 29 Sep 2020 05:45:13 +0000 (08:45 +0300)

committer GitHub <noreply@github.com>

Tue, 29 Sep 2020 05:45:13 +0000 (08:45 +0300)
author Mykola Golub <mgolub@suse.com>
Tue, 29 Sep 2020 05:45:13 +0000 (08:45 +0300)
committer GitHub <noreply@github.com>
Tue, 29 Sep 2020 05:45:13 +0000 (08:45 +0300)
diff --cc src/librbd/CMakeLists.txt
Simple merge
diff --cc src/librbd/crypto/CryptoObjectDispatch.cc
Simple merge
author	Mykola Golub <mgolub@suse.com>
	Tue, 29 Sep 2020 05:45:13 +0000 (08:45 +0300)
committer	GitHub <noreply@github.com>
	Tue, 29 Sep 2020 05:45:13 +0000 (08:45 +0300)
		1	2
src/librbd/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/crypto/CryptoObjectDispatch.cc	patch \|	diff1 \|	diff2 \|	blob \| history