]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #11944 from SUSE/wip-17866-jewel
authorSage Weil <sage@redhat.com>
Mon, 5 Dec 2016 19:01:03 +0000 (14:01 -0500)
committerGitHub <noreply@github.com>
Mon, 5 Dec 2016 19:01:03 +0000 (14:01 -0500)
jewel: osd: Add config option to disable new scrubs during recovery

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/OSD.cc

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