From: Sage Weil <sage@newdream.net>
Date: Fri, 2 Jun 2017 15:32:15 +0000 (-0500)
Subject: Merge pull request #15217 from badone/wip-async-sleep-timer-fix
X-Git-Tag: v12.1.0~295
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b98ad7cadb93eba5f4e3c82990bae69e94e0f78b;p=ceph-ci.git

Merge pull request #15217 from badone/wip-async-sleep-timer-fix

osd: Move scrub sleep timer to osdservice

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

b98ad7cadb93eba5f4e3c82990bae69e94e0f78b