]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'upstream/wip-ecbackend-for-review'
authorSamuel Just <sam.just@inktank.com>
Tue, 18 Feb 2014 18:56:02 +0000 (10:56 -0800)
committerSamuel Just <sam.just@inktank.com>
Tue, 18 Feb 2014 18:56:12 +0000 (10:56 -0800)
commit43b5cf977cd93bd5ee811491c4728701fa1a3ae2
treebaa2958aa532ddc85d3ddac6afe977a8beca0f61
parent45a782ff562b130643d1e45418cacf7cc9587035
parent5e727bfe1a3c48a44dc45489ad70cf08aeb63019
Merge remote-tracking branch 'upstream/wip-ecbackend-for-review'

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