]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #37431 from sseshasa/wip-handle-future-sched-ops
authorSridhar Seshasayee <sseshasa@redhat.com>
Sat, 24 Oct 2020 07:52:01 +0000 (13:22 +0530)
committerGitHub <noreply@github.com>
Sat, 24 Oct 2020 07:52:01 +0000 (13:22 +0530)
osd: Handle possible future work items returned from mclock scheduler.

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.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