From: Sage Weil <sage@newdream.net>
Date: Sat, 20 Mar 2021 13:17:26 +0000 (-0400)
Subject: Merge PR #40219 into master
X-Git-Tag: v17.1.0~2542
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bbb5490e9c2aaa796ee0875fdddb04c698c5bd39;p=ceph.git

Merge PR #40219 into master

* refs/pull/40219/head:
	mon/MgrStatMonitor: ignore MMgrReport from non-active mgr
	mgr: tell monc when we get new servicemap, fsmap

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

bbb5490e9c2aaa796ee0875fdddb04c698c5bd39