From: Yuri Weinstein <yweinste@redhat.com>
Date: Fri, 25 Jan 2019 16:08:34 +0000 (-0800)
Subject: Merge pull request #25513 from smithfarm/wip-37342-mimic
X-Git-Tag: v13.2.5~111
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3ad6b50f39c61347f8a12a004f57bad03ccff096;p=ceph.git

Merge pull request #25513 from smithfarm/wip-37342-mimic

mimic: osd: Prioritize user specified scrubs

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

3ad6b50f39c61347f8a12a004f57bad03ccff096