]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #5922 from trociny/wip-pool-set-noscrub
authorDavid Zafman <dzafman@redhat.com>
Tue, 22 Sep 2015 16:32:18 +0000 (09:32 -0700)
committerDavid Zafman <dzafman@redhat.com>
Tue, 22 Sep 2015 16:32:18 +0000 (09:32 -0700)
osd: per pool control for scrub and deep-scrub

Reviewed-by: David Zafman <dzafman@redhat.com>
1  2 
src/osd/OSD.cc
src/osd/osd_types.cc

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