]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #931 from ceph/wip-5858-rebase
authorathanatos <sam.just@inktank.com>
Mon, 13 Jan 2014 22:25:51 +0000 (14:25 -0800)
committerathanatos <sam.just@inktank.com>
Mon, 13 Jan 2014 22:25:51 +0000 (14:25 -0800)
commit196e3d62780554e5e21994d2cee0af9a7c873f07
tree049ca2b600da45808b76878ea72e7a569aa08875
parent90343708b3e2bc4178cee94d66d39c27d05de298
parentc0d92b6744d793f85c1ce2f7c5c67b9e9c18a135
Merge pull request #931 from ceph/wip-5858-rebase

Wip 5858 rebase

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