]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-rbd-clone-dmick' into master
authorDan Mick <dan.mick@inktank.com>
Tue, 10 Jul 2012 21:04:59 +0000 (14:04 -0700)
committerDan Mick <dan.mick@inktank.com>
Tue, 10 Jul 2012 21:20:18 +0000 (14:20 -0700)
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
1  2 
src/include/rados/librados.h
src/include/rados/librados.hpp
src/librados/librados.cc
src/librbd.cc

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