]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1510 from ceph/wip-pq
authorSamuel Just <sam.just@inktank.com>
Fri, 21 Mar 2014 20:39:50 +0000 (13:39 -0700)
committerSamuel Just <sam.just@inktank.com>
Fri, 21 Mar 2014 20:39:50 +0000 (13:39 -0700)
osd: some PrioritizedQueue cleanups; dump locking fix; debug pqueue state at high debug level

Reviewed-by: Samuel Just <sam.just@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