]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #25513 from smithfarm/wip-37342-mimic
authorYuri Weinstein <yweinste@redhat.com>
Fri, 25 Jan 2019 16:08:34 +0000 (08:08 -0800)
committerGitHub <noreply@github.com>
Fri, 25 Jan 2019 16:08:34 +0000 (08:08 -0800)
mimic: osd: Prioritize user specified scrubs

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
1  2 
src/osd/PG.cc

diff --cc src/osd/PG.cc
Simple merge