]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #1735 from ceph/wip-8113
authorDavid Zafman <david.zafman@inktank.com>
Sat, 3 May 2014 02:26:30 +0000 (19:26 -0700)
committerDavid Zafman <david.zafman@inktank.com>
Sat, 3 May 2014 02:26:30 +0000 (19:26 -0700)
commit3e31458444e3aa73d36b172c1f8443ec7d6603db
tree9a37853c948baad2588101f1fc4382e8d0d45b75
parent4aa93dd12c12a2b383dea50fe25f1f26ce8c02c6
parentf47f867952e6b2a16a296c82bb9b585b21cde6c8
Merge pull request #1735 from ceph/wip-8113

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