Merge pull request #32217 from trociny/wip-41557-2

author Jason Dillaman <dillaman@redhat.com>

Mon, 16 Dec 2019 18:14:28 +0000 (13:14 -0500)

committer GitHub <noreply@github.com>

Mon, 16 Dec 2019 18:14:28 +0000 (13:14 -0500)
author Jason Dillaman <dillaman@redhat.com>
Mon, 16 Dec 2019 18:14:28 +0000 (13:14 -0500)
committer GitHub <noreply@github.com>
Mon, 16 Dec 2019 18:14:28 +0000 (13:14 -0500)
diff --cc src/test/rbd_mirror/test_ImageReplayer.cc
Simple merge
author	Jason Dillaman <dillaman@redhat.com>
	Mon, 16 Dec 2019 18:14:28 +0000 (13:14 -0500)
committer	GitHub <noreply@github.com>
	Mon, 16 Dec 2019 18:14:28 +0000 (13:14 -0500)