]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #15526 from badone/wip-async-sleep-timer-fix-kraken
authorNathan Cutler <presnypreklad@gmail.com>
Tue, 1 Aug 2017 09:08:47 +0000 (11:08 +0200)
committerGitHub <noreply@github.com>
Tue, 1 Aug 2017 09:08:47 +0000 (11:08 +0200)
kraken: osd: Implement asynchronous scrub sleep

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/osd/OSD.cc

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