]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage@newdream.net>
Wed, 22 Jun 2011 20:58:38 +0000 (13:58 -0700)
committerSage Weil <sage@newdream.net>
Wed, 22 Jun 2011 20:58:38 +0000 (13:58 -0700)
Conflicts:
src/librbd.cc

1  2 
src/client/Client.cc
src/client/Client.h

Simple merge
Simple merge