]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit4742f5d4721c298b9366d148fa13cf433980da60
tree0b70c7de84d0a6da3bf987a1ff9d4a1988a2e664
parent273b4706b28bbb7e0e4a9a0b03de0211a2dc9567
parentc27b73f965602bfd67ec0714f5b33c509316eeae
Merge pull request #6012 from liewegas/wip-mon

mon: misc scaling fixes

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