From: Sage Weil <sage@redhat.com>
Date: Mon, 19 Nov 2018 19:15:21 +0000 (-0600)
Subject: Merge PR #25111 into master
X-Git-Tag: v14.1.0~877
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ba49aacee2353f728089a0f271b8ca4a10636c8a;p=ceph-ci.git

Merge PR #25111 into master

* refs/pull/25111/head:
	test: Add test for requested scrub priority
	osd: Prioritize user specified scrubs

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

ba49aacee2353f728089a0f271b8ca4a10636c8a