]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #6084 from liewegas/wip-revert-scrub
authorSage Weil <sage@redhat.com>
Mon, 28 Sep 2015 20:40:31 +0000 (16:40 -0400)
committerSage Weil <sage@redhat.com>
Mon, 28 Sep 2015 20:40:31 +0000 (16:40 -0400)
Revert "osd: new pool settings: scrub intervals"

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
1  2 
qa/workunits/cephtool/test.sh
src/osd/OSD.cc
src/osd/OSD.h
src/osd/PG.cc
src/osd/osd_types.cc
src/osd/osd_types.h

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