]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-3527'
authorDavid Zafman <david.zafman@inktank.com>
Thu, 6 Jun 2013 07:38:50 +0000 (00:38 -0700)
committerDavid Zafman <david.zafman@inktank.com>
Thu, 6 Jun 2013 07:40:53 +0000 (00:40 -0700)
Reviewed-by: Samuel Just <sam.just@inktank.com>
1  2 
src/include/rados/librados.hpp
src/librados/librados.cc

Simple merge
Simple merge