]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #30155 into master
authorSage Weil <sage@redhat.com>
Tue, 10 Sep 2019 12:14:27 +0000 (07:14 -0500)
committerSage Weil <sage@redhat.com>
Tue, 10 Sep 2019 12:14:27 +0000 (07:14 -0500)
* 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>
1  2 
src/mgr/DaemonServer.cc
src/mon/MgrMonitor.cc

Simple merge
Simple merge