]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #20512 into wip-sage-testing-20180407.022843
authorSage Weil <sage@redhat.com>
Sat, 7 Apr 2018 02:29:32 +0000 (21:29 -0500)
committerSage Weil <sage@redhat.com>
Sat, 7 Apr 2018 02:29:32 +0000 (21:29 -0500)
commitd7bca5d19fd9103c5af601b0e10f45c9f1a51ae6
tree916077b00d97b7f3fcc1b38ad89f0a31f2bf8e87
parentf67f3f87b7b43e8b12e4df26c51863e5a633c052
parentaec47bc6525474c6f1f60405ae5cd644c923a1d1
Merge PR #20512 into wip-sage-testing-20180407.022843

* refs/pull/20512/head:
osd: osd_mon_report_interval_min -> osd_mon_report_interval, kill _max

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
.githubmap
PendingReleaseNotes
src/common/legacy_config_opts.h
src/common/options.cc
src/osd/OSD.cc