From: Sage Weil <sage@redhat.com>
Date: Tue, 11 Sep 2018 14:27:34 +0000 (-0500)
Subject: Merge PR #24006 into master
X-Git-Tag: v14.0.1~341
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=57f307b682401dd534432ada31bffaa992f04a1e;p=ceph.git

Merge PR #24006 into master

* refs/pull/24006/head:
	osd/OSD: clear ping_history on heartbeat_reset
	mon/OSDMonitor: share new maps with even non-active osds

Reviewed-by: Sage Weil <sage@redhat.com>
---

57f307b682401dd534432ada31bffaa992f04a1e