]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-librados-tests'
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Fri, 19 Aug 2011 00:00:38 +0000 (17:00 -0700)
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Fri, 19 Aug 2011 00:00:38 +0000 (17:00 -0700)
commit8c822a80e51ce2a6235052ebb00c8d2c59f60220
treec3b5e599268590224c14193a43212d7b2c15bb5a
parenteb8925a730e735624562dad67894dc373079b934
parent665fd8214d4f8fa54a675c2998b22613424a6cb3
Merge branch 'wip-librados-tests'

Conflicts:
src/include/rados/librados.hpp
src/librados.cc
src/rgw/rgw_rados.cc
src/testradospp.cc
src/Makefile.am
src/include/rados/librados.hpp
src/librados.cc
src/rgw/rgw_rados.cc
src/test/test_mutate.cc