]> 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: 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)
* 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>
1  2 
src/cephadm/cephadm patch | diff1 | diff2 | blob | history
src/pybind/mgr/cephadm/serve.py patch | diff1 | diff2 | blob | history

diff --cc src/cephadm/cephadm
Simple merge
diff --cc src/pybind/mgr/cephadm/serve.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.