]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #4539 from athanatos/wip-11429
authorSamuel Just <sam.just@inktank.com>
Mon, 4 May 2015 23:36:32 +0000 (16:36 -0700)
committerSamuel Just <sam.just@inktank.com>
Mon, 4 May 2015 23:36:32 +0000 (16:36 -0700)
OSD: handle the case where we resurrected an old, deleted pg

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/OSD.cc

diff --cc src/osd/OSD.cc
Simple merge