]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #7465 from liewegas/wip-promote-throttle
authorSage Weil <sage@redhat.com>
Fri, 11 Mar 2016 17:15:46 +0000 (12:15 -0500)
committerSage Weil <sage@redhat.com>
Fri, 11 Mar 2016 17:15:46 +0000 (12:15 -0500)
osd: probabilistic cache tier promotion throttling

Reviewed-by: Samuel Just <sjust@redhat.com>
1  2 
src/common/config_opts.h
src/osd/OSD.cc
src/osd/OSD.h
src/osd/ReplicatedPG.cc
src/osd/osd_types.h

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