Merge pull request #39967 from dillaman/wip-49417-octopus

author Yuri Weinstein <yweinste@redhat.com>

Thu, 18 Mar 2021 16:47:56 +0000 (09:47 -0700)

committer GitHub <noreply@github.com>

Thu, 18 Mar 2021 16:47:56 +0000 (09:47 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Thu, 18 Mar 2021 16:47:56 +0000 (09:47 -0700)
committer GitHub <noreply@github.com>
Thu, 18 Mar 2021 16:47:56 +0000 (09:47 -0700)
diff --cc src/test/rbd_mirror/image_replayer/snapshot/test_mock_Replayer.cc
Simple merge
diff --cc src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Thu, 18 Mar 2021 16:47:56 +0000 (09:47 -0700)
committer	GitHub <noreply@github.com>
	Thu, 18 Mar 2021 16:47:56 +0000 (09:47 -0700)
		1	2
src/test/rbd_mirror/image_replayer/snapshot/test_mock_Replayer.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc	patch \|	diff1 \|	diff2 \|	blob \| history