]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1316 from ceph/dumpling-6922
authorSamuel Just <sam.just@inktank.com>
Tue, 25 Feb 2014 23:47:05 +0000 (15:47 -0800)
committerSamuel Just <sam.just@inktank.com>
Tue, 25 Feb 2014 23:47:05 +0000 (15:47 -0800)
Dumpling: Prevent extreme PG split multipliers

Reviewed-by: Samuel Just <sam.just@inktank.com>
1  2 
src/common/config_opts.h
src/mon/OSDMonitor.cc

Simple merge
Simple merge