]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-rbd-protect' into more-rebasing
authorDan Mick <dan.mick@inktank.com>
Sat, 18 Aug 2012 01:42:04 +0000 (18:42 -0700)
committerDan Mick <dan.mick@inktank.com>
Sat, 18 Aug 2012 01:42:04 +0000 (18:42 -0700)
commit5ffbeaa31ed76c0797dd74ad54ebe401760f50b4
tree386ae84d4c69429803bd3ec70a15b1c9e7bc4340
parent460242d31fd4b938a8d58d342db4ce0483b348d2
parentce0bc11aaeed7fb6797c878e98da4a90d2055a45
Merge branch 'wip-rbd-protect' into more-rebasing

Conflicts:
src/librbd/ImageCtx.cc
src/librbd/SnapInfo.h
src/librbd/internal.cc
src/test/rbd/test_cls_rbd.cc
src/cls_rbd.cc
src/librbd/ImageCtx.cc
src/librbd/ImageCtx.h
src/librbd/SnapInfo.h
src/librbd/cls_rbd_client.cc
src/librbd/cls_rbd_client.h
src/librbd/internal.cc
src/test/rbd/test_cls_rbd.cc