]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a07e7c3 0019005)
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)
commiteec51eb756d4112720f9b6c31bfbb7b8ced620f5
tree7f153fe5698d812c09aeaac1fa8d393127b5e220tree | snapshot
parenta07e7c356b99b5e6d6cd0581106728ef49ad7234commit | diff
parent0019005e87a0f0f31fbd5351fc9e82d56689cdfdcommit | diff
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>
src/mgr/DaemonServer.cc diff1 | diff2 | blob | history
src/mon/MgrMonitor.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.