Merge pull request #33097 from dillaman/wip-43933

author Mykola Golub <mgolub@suse.com>

Fri, 14 Feb 2020 13:38:32 +0000 (15:38 +0200)

committer GitHub <noreply@github.com>

Fri, 14 Feb 2020 13:38:32 +0000 (15:38 +0200)
author Mykola Golub <mgolub@suse.com>
Fri, 14 Feb 2020 13:38:32 +0000 (15:38 +0200)
committer GitHub <noreply@github.com>
Fri, 14 Feb 2020 13:38:32 +0000 (15:38 +0200)
diff --cc src/tools/rbd/action/MirrorPool.cc
Simple merge
diff --cc src/tools/rbd_mirror/PoolReplayer.cc
Simple merge
author	Mykola Golub <mgolub@suse.com>
	Fri, 14 Feb 2020 13:38:32 +0000 (15:38 +0200)
committer	GitHub <noreply@github.com>
	Fri, 14 Feb 2020 13:38:32 +0000 (15:38 +0200)
		1	2
src/tools/rbd/action/MirrorPool.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/rbd_mirror/PoolReplayer.cc	patch \|	diff1 \|	diff2 \|	blob \| history