]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8899568 73d9466)
Merge PR #40279 into pacific
authorSage Weil <sage@newdream.net>
Tue, 23 Mar 2021 00:20:30 +0000 (19:20 -0500)
committerSage Weil <sage@newdream.net>
Tue, 23 Mar 2021 00:20:30 +0000 (19:20 -0500)
* refs/pull/40279/head:
mgr/cephadm: identify rgw, cepfs-mirror in servicemap
mgr/ServiceMap: adjust 'ceph -s' summary
rgw: register daemons in servicemap by gid; include id
cephadm: fix rbd-mirror auth name

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

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