]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66a2f61 4d44709)
Merge PR #40219 into master
authorSage Weil <sage@newdream.net>
Sat, 20 Mar 2021 13:17:26 +0000 (09:17 -0400)
committerSage Weil <sage@newdream.net>
Sat, 20 Mar 2021 13:17:26 +0000 (09:17 -0400)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.