]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage@inktank.com>
Tue, 19 Mar 2013 05:54:25 +0000 (22:54 -0700)
committerSage Weil <sage@inktank.com>
Tue, 19 Mar 2013 05:54:25 +0000 (22:54 -0700)
1  2 
src/rbd.cc

diff --cc src/rbd.cc
Simple merge