git-server-git.apps.pok.os.sepia.ceph.com Git

]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

author	Josh Durgin <jdurgin@redhat.com>
	Tue, 10 May 2016 15:10:24 +0000 (08:10 -0700)
committer	Josh Durgin <jdurgin@redhat.com>
	Tue, 10 May 2016 15:10:24 +0000 (08:10 -0700)
commit	7fcb52d0d363655c1ac2f560acd2b436efc6fc2f
tree	a69b40be04e3ea5848ec2a112c193823c1241f62	tree \| snapshot
parent	43b66f9721a27e539e29dd23e65eb20501710257	commit \| diff
parent	fa91919c856ac8186545bc8f8da31a8f438a9b5d	commit \| diff

Merge pull request #8921 from dillaman/wip-15110

rbd-mirror: image sync needs to handle snapshot size and protection status

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Conflicts:
src/test/librbd/test_mock_Journal.cc (moved and edited MockJournaler - trivial)

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

src/librbd/Operations.cc	diff1 \|	diff2 \|	blob \| history
src/librbd/journal/Replay.cc	diff1 \|	diff2 \|	blob \| history
src/test/Makefile-client.am	diff1 \|	diff2 \|	blob \| history
src/test/journal/mock/MockJournaler.h	\|	diff2 \|	blob \| history
src/test/librbd/test_mock_Journal.cc	diff1 \|	diff2 \|	blob \| history