]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-6444' into next
authorYehuda Sadeh <yehuda@inktank.com>
Fri, 11 Oct 2013 22:44:00 +0000 (15:44 -0700)
committerYehuda Sadeh <yehuda@inktank.com>
Fri, 11 Oct 2013 22:44:00 +0000 (15:44 -0700)
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
1  2 
src/include/rados/librados.hpp

Simple merge