]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #14597 from gregsfortytwo/wip-kraken-snaptrim
authorNathan Cutler <presnypreklad@gmail.com>
Tue, 25 Jul 2017 05:13:48 +0000 (07:13 +0200)
committerGitHub <noreply@github.com>
Tue, 25 Jul 2017 05:13:48 +0000 (07:13 +0200)
kraken: core: improve control and throttling of the snap trimmer

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/common/config_opts.h
src/osd/OSD.cc
src/osd/OSD.h
src/osd/PG.cc
src/osd/PrimaryLogPG.cc
src/osd/PrimaryLogPG.h
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
Simple merge