]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #4186 from ceph/wip-7787
authorJosh Durgin <jdurgin@redhat.com>
Wed, 29 Apr 2015 23:42:03 +0000 (16:42 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Wed, 29 Apr 2015 23:42:03 +0000 (16:42 -0700)
librbd: add fast diff feature

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
doc/man/8/rbd.rst
src/cls/rbd/cls_rbd.cc
src/librbd/ImageCtx.cc
src/librbd/internal.cc
src/rbd.cc
src/test/cli/rbd/help.t
src/test/cls_rbd/test_cls_rbd.cc

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/rbd.cc
Simple merge
Simple merge
Simple merge