Merge pull request #41696 from MrFreezeex/fix-rbd-mirror-remove

author Mykola Golub <mgolub@suse.com>

Mon, 25 Oct 2021 15:12:38 +0000 (18:12 +0300)

committer GitHub <noreply@github.com>

Mon, 25 Oct 2021 15:12:38 +0000 (18:12 +0300)
author Mykola Golub <mgolub@suse.com>
Mon, 25 Oct 2021 15:12:38 +0000 (18:12 +0300)
committer GitHub <noreply@github.com>
Mon, 25 Oct 2021 15:12:38 +0000 (18:12 +0300)
diff --cc src/cls/rbd/cls_rbd.cc
Simple merge
diff --cc src/test/rbd_mirror/test_ImageReplayer.cc
Simple merge
diff --cc src/tools/rbd_mirror/ImageMap.cc
Simple merge
diff --cc src/tools/rbd_mirror/ImageReplayer.cc
Simple merge
author	Mykola Golub <mgolub@suse.com>
	Mon, 25 Oct 2021 15:12:38 +0000 (18:12 +0300)
committer	GitHub <noreply@github.com>
	Mon, 25 Oct 2021 15:12:38 +0000 (18:12 +0300)
		1	2
src/cls/rbd/cls_rbd.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/rbd_mirror/test_ImageReplayer.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/rbd_mirror/ImageMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/rbd_mirror/ImageReplayer.cc	patch \|	diff1 \|	diff2 \|	blob \| history