]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-4778' into next
authorDavid Zafman <david.zafman@inktank.com>
Thu, 25 Apr 2013 00:33:00 +0000 (17:33 -0700)
committerDavid Zafman <david.zafman@inktank.com>
Thu, 25 Apr 2013 00:33:00 +0000 (17:33 -0700)
commitf4804849b7644f2c1dfd92404682f510a88e9a23
treebad611d03fb7f423e177b3010f605685c7be141a
parent432252202832a5446532075d2a05be726469c814
parentac3dda214d52c10206328a92e4373521200c8863
Merge branch 'wip-4778' into next

Reviewed-by: Samuel Just <sam.just@inktank.com>
src/osd/PG.cc
src/osd/ReplicatedPG.cc
src/osd/osd_types.cc
src/osd/osd_types.h