]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote branch 'origin/wip-rbd-snapid' into next
authorJosh Durgin <josh.durgin@dreamhost.com>
Tue, 24 Apr 2012 20:58:56 +0000 (13:58 -0700)
committerJosh Durgin <josh.durgin@dreamhost.com>
Tue, 24 Apr 2012 20:59:09 +0000 (13:59 -0700)
Reviewed-by: Sage Weil <sage.weil@dreamhost.com>
1  2 
src/librbd.cc

diff --cc src/librbd.cc
Simple merge