]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'upstream/wip_lost_unfound_event'
authorSamuel Just <sam.just@inktank.com>
Wed, 7 Nov 2012 19:34:44 +0000 (11:34 -0800)
committerSamuel Just <sam.just@inktank.com>
Wed, 7 Nov 2012 19:35:04 +0000 (11:35 -0800)
commit3faefdd24205380c396c3c93b2a1e378eb3ff8e9
treeea65642722c4c682c1aa4491f6707e29d8ef5739
parent3b26a4d909fe7e32bfffd7b86409475f5c462cb3
parent85cd694846ef04ad5e4975955f9696856158da8a
Merge remote-tracking branch 'upstream/wip_lost_unfound_event'

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