]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commitddde1c8f6a1ce3b5860e60f55c132eee372d4c83
tree83cdbe5e66106ff9339ecef3057bfdf8b46dea9b
parent91a2492a9b38e7d06e532ac3cf470aa1c6a560c1
parentbcd6aea3c92ef498e550c486a9ee12e2d1bbfd92
Merge branch 'wip-testrados'

Lightly-reviewed-by: Josh Durgin <josh.durgin@inktank.com>
src/osdc/Objecter.cc
src/osdc/Objecter.h