]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e1cc63c 2bd11c4)
Merge PR #40220 into master
authorSage Weil <sage@newdream.net>
Sat, 20 Mar 2021 13:15:58 +0000 (09:15 -0400)
committerSage Weil <sage@newdream.net>
Sat, 20 Mar 2021 13:15:58 +0000 (09:15 -0400)
commitc9f97045a2e639e63ed7c72c5295b278a8ca9926
tree56dd710492f6e409c8067c7ba2eb6a741f356f5etree | snapshot
parente1cc63c116806bcde82b17723fdac6413ef1bffecommit | diff
parent2bd11c4ceb156a398423e4f7ee3131624a86f810commit | diff
Merge PR #40220 into master

* refs/pull/40220/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: Casey Bodley <cbodley@redhat.com>
src/cephadm/cephadm diff1 | diff2 | blob | history
src/pybind/mgr/cephadm/serve.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.