From: Sage Weil <sage@redhat.com>
Date: Tue, 12 Feb 2019 15:26:56 +0000 (-0600)
Subject: Merge PR #26340 into master
X-Git-Tag: v14.1.0~149
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e63814f1e22cda6f5dd22c28c8a83d699e0e9826;p=ceph.git

Merge PR #26340 into master

* 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>
---

e63814f1e22cda6f5dd22c28c8a83d699e0e9826