]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1256 from ceph/wip-librados-ops-and-rvals
authorJosh Durgin <josh.durgin@inktank.com>
Wed, 19 Feb 2014 19:18:57 +0000 (11:18 -0800)
committerJosh Durgin <josh.durgin@inktank.com>
Wed, 19 Feb 2014 19:18:57 +0000 (11:18 -0800)
librados c api for object operations and a few bug fixes

Reviewed-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Loic Dachary <loic@dachary.org>
Reviewed-by: Sage Weil <sage.weil@inktank.com>
1  2 
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h

Simple merge
Simple merge