]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #6012 from liewegas/wip-mon
authorSage Weil <sage@redhat.com>
Fri, 25 Sep 2015 12:52:29 +0000 (08:52 -0400)
committerSage Weil <sage@redhat.com>
Fri, 25 Sep 2015 12:52:29 +0000 (08:52 -0400)
mon: misc scaling fixes

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/common/config_opts.h
src/mon/OSDMonitor.cc
src/osd/OSD.cc

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