]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1356 from ceph/wip-7458
authorDavid Zafman <david.zafman@inktank.com>
Mon, 3 Mar 2014 22:47:38 +0000 (14:47 -0800)
committerDavid Zafman <david.zafman@inktank.com>
Mon, 3 Mar 2014 22:47:38 +0000 (14:47 -0800)
osd: stray pg ref on shutdown

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

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