]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #25456 into master
authorSage Weil <sage@redhat.com>
Tue, 18 Dec 2018 12:42:02 +0000 (06:42 -0600)
committerSage Weil <sage@redhat.com>
Tue, 18 Dec 2018 12:42:02 +0000 (06:42 -0600)
* refs/pull/25456/head:
common/options: set mon or mgr service on these options
common/options: more mon options
common/options: kill old mon_max_pgmap_epochs option
common/options: mon options
mon: remove dead option mon_pg_min_inactive
mon: mon_osd_pool_ec_fast_read -> osd_pool_default_ec_fast_read
common/options: document mon options
common/options: messenger options
common/options: document misc
common/options: compression options
common/options: document monitor log options

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
1  2 
src/common/legacy_config_opts.h
src/common/options.cc
src/mon/OSDMonitor.cc

Simple merge
Simple merge
Simple merge