]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02df8f3 1841928)
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)
* refs/pull/25111/head:
test: Add test for requested scrub priority
osd: Prioritize user specified scrubs

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.