]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #26340 into master
authorSage Weil <sage@redhat.com>
Tue, 12 Feb 2019 15:26:56 +0000 (09:26 -0600)
committerSage Weil <sage@redhat.com>
Tue, 12 Feb 2019 15:26:56 +0000 (09:26 -0600)
* refs/pull/26340/head:
osd/OSD: respect osdmap message limits
mon/OSDMonitor: limit MOSDMap message size by bytes
common/options: add osd_map_message_max_bytes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Trivial merge