]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #3893 from ceph/wip-10390
authorGregory Farnum <greg@gregs42.com>
Mon, 23 Mar 2015 18:17:42 +0000 (11:17 -0700)
committerGregory Farnum <greg@gregs42.com>
Mon, 23 Mar 2015 18:17:42 +0000 (11:17 -0700)
#10390: Refactor stray handling code and add throttling

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
1  2 
src/common/config_opts.h
src/mds/MDS.cc

Simple merge
diff --cc src/mds/MDS.cc
Simple merge