]> 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: 6bc166b 9002400)
Merge PR #39855 into master
authorSage Weil <sage@newdream.net>
Fri, 5 Mar 2021 20:33:38 +0000 (15:33 -0500)
committerSage Weil <sage@newdream.net>
Fri, 5 Mar 2021 20:33:38 +0000 (15:33 -0500)
* refs/pull/39855/head:
qa/suites/rgw/singleton: add trivial cephadm case
Revert "rgw: register daemon in service map with more details"

Reviewed-by: Sebastian Wagner <swagner@suse.com>

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