]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-testrados'
authorSage Weil <sage@inktank.com>
Sun, 21 Oct 2012 16:01:33 +0000 (09:01 -0700)
committerSage Weil <sage@inktank.com>
Sun, 21 Oct 2012 16:01:33 +0000 (09:01 -0700)
Lightly-reviewed-by: Josh Durgin <josh.durgin@inktank.com>
1  2 
src/osdc/Objecter.cc
src/osdc/Objecter.h

Simple merge
Simple merge