Merge pull request #24401 from dillaman/wip-36144-mimic

author Yuri Weinstein <yweinste@redhat.com>

Wed, 17 Oct 2018 19:56:50 +0000 (15:56 -0400)

committer GitHub <noreply@github.com>

Wed, 17 Oct 2018 19:56:50 +0000 (15:56 -0400)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 17 Oct 2018 19:56:50 +0000 (15:56 -0400)
committer GitHub <noreply@github.com>
Wed, 17 Oct 2018 19:56:50 +0000 (15:56 -0400)
diff --cc src/librbd/deep_copy/ObjectCopyRequest.cc
Simple merge
diff --cc src/test/librbd/deep_copy/test_mock_ObjectCopyRequest.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 17 Oct 2018 19:56:50 +0000 (15:56 -0400)
committer	GitHub <noreply@github.com>
	Wed, 17 Oct 2018 19:56:50 +0000 (15:56 -0400)
		1	2
src/librbd/deep_copy/ObjectCopyRequest.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/librbd/deep_copy/test_mock_ObjectCopyRequest.cc	patch \|	diff1 \|	diff2 \|	blob \| history