]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1357 from ceph/wip-dumpling-removewq
authorSamuel Just <sam.just@inktank.com>
Tue, 4 Mar 2014 15:28:44 +0000 (07:28 -0800)
committerSamuel Just <sam.just@inktank.com>
Tue, 4 Mar 2014 15:28:44 +0000 (07:28 -0800)
OSD: ping tphandle during pg removal

Reviewed-by: Greg Farnum <greg@inktank.com>
1  2 
src/osd/OSD.cc
src/osd/OSD.h

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