]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #2203 from ceph/wip-scrub-firefly
authorSamuel Just <sam.just@inktank.com>
Tue, 26 Aug 2014 17:30:14 +0000 (10:30 -0700)
committerSamuel Just <sam.just@inktank.com>
Tue, 26 Aug 2014 17:30:14 +0000 (10:30 -0700)
commit938d735697e2af0b01dd2613a9152b3caef5db57
tree2df7f1cc4b2ee1a30176ea4dd851a04e87e0cf86
parent2f11631f3144f2cc0e04d718e40e716540c8af19
parent9ca451a6bf2f29e75f72cbd3dbcff0bf8986e462
Merge pull request #2203 from ceph/wip-scrub-firefly

backport scrub throttling to firefly

Reviewed-by: Samuel Just <sam.just@inktank.com>
src/common/Makefile.am
src/common/config_opts.h
src/osd/OSD.cc
src/osd/PG.cc