Merge pull request #9594 from dillaman/wip-16165

author Mykola Golub <to.my.trociny@gmail.com>

Thu, 9 Jun 2016 20:34:11 +0000 (23:34 +0300)

committer GitHub <noreply@github.com>

Thu, 9 Jun 2016 20:34:11 +0000 (23:34 +0300)
author Mykola Golub <to.my.trociny@gmail.com>
Thu, 9 Jun 2016 20:34:11 +0000 (23:34 +0300)
committer GitHub <noreply@github.com>
Thu, 9 Jun 2016 20:34:11 +0000 (23:34 +0300)
diff --cc src/librbd/Journal.cc
Simple merge
diff --cc src/librbd/Journal.h
Simple merge
diff --cc src/test/rbd_mirror/test_mock_ImageReplayer.cc
Simple merge
diff --cc src/tools/rbd_mirror/ImageReplayer.cc
Simple merge
author	Mykola Golub <to.my.trociny@gmail.com>
	Thu, 9 Jun 2016 20:34:11 +0000 (23:34 +0300)
committer	GitHub <noreply@github.com>
	Thu, 9 Jun 2016 20:34:11 +0000 (23:34 +0300)
		1	2
src/librbd/Journal.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/Journal.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/rbd_mirror/test_mock_ImageReplayer.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/rbd_mirror/ImageReplayer.cc	patch \|	diff1 \|	diff2 \|	blob \| history