]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #25111 into master
authorSage Weil <sage@redhat.com>
Mon, 19 Nov 2018 19:15:21 +0000 (13:15 -0600)
committerSage Weil <sage@redhat.com>
Mon, 19 Nov 2018 19:15:21 +0000 (13:15 -0600)
commitba49aacee2353f728089a0f271b8ca4a10636c8a
treed298673d550fa70a0399737e110f4a5a9dae49d1
parent02df8f3008d6ab0903cb1bb5577ca813dd3c4d00
parent1841928e28654722a5d98df89a40454bbd993314
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>