]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #1713 from ceph/wip-7439
authorSamuel Just <sam.just@inktank.com>
Wed, 23 Apr 2014 00:36:20 +0000 (17:36 -0700)
committerSamuel Just <sam.just@inktank.com>
Wed, 23 Apr 2014 00:36:20 +0000 (17:36 -0700)
commita06f8667d264d43c0ff2d371978c908b8f438e25
tree610500209c3d26e0b7d52e5609d6c10281515920
parent009e8746868795271f2642105f7a3164753ed4f2
parent2182815c67d50d5365bb92af97edbbaae44fdad8
Merge pull request #1713 from ceph/wip-7439

Wip 7439

Reviewed-by: Sage Weil <sage@inktank.com>
src/osd/OSD.cc
src/osd/PG.cc
src/osd/PG.h
src/osd/ReplicatedPG.cc