From: Sage Weil <sage@redhat.com>
Date: Tue, 10 Sep 2019 12:14:27 +0000 (-0500)
Subject: Merge PR #30155 into master
X-Git-Tag: v15.1.0~1620
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eec51eb756d4112720f9b6c31bfbb7b8ced620f5;p=ceph.git

Merge PR #30155 into master

* refs/pull/30155/head:
	mgr/MgrClient: send MMgrCommand for octopus+ mgrs
	mon/MgrMap: include mgr_features in mgrmap
	mgr: accept MMgrCommand[Reply] messages (in addition to MCommand[Reply])

Reviewed-by: Neha Ojha <nojha@redhat.com>
---

eec51eb756d4112720f9b6c31bfbb7b8ced620f5