]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip_osd_throttle'
authorSamuel Just <sam.just@inktank.com>
Wed, 29 May 2013 22:06:18 +0000 (15:06 -0700)
committerSamuel Just <sam.just@inktank.com>
Wed, 29 May 2013 22:06:18 +0000 (15:06 -0700)
Fixes: #4782
Reviewed-by: Sage Weil
1  2 
src/Makefile.am
src/common/config_opts.h
src/osd/ReplicatedPG.cc

diff --cc src/Makefile.am
Simple merge
Simple merge
Simple merge