]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorJosh Durgin <josh.durgin@dreamhost.com>
Thu, 31 Mar 2011 00:35:08 +0000 (17:35 -0700)
committerJosh Durgin <josh.durgin@dreamhost.com>
Thu, 31 Mar 2011 00:35:08 +0000 (17:35 -0700)
1  2 
src/include/rados/librados.hpp
src/librados.cc

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