]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commita27e8a4868784656cb0fce8b562d6533ae240940
tree0a7c4499b6e00a58bc6799377bb796cf7df6e0d9
parent6bc166b77bdca0d6ce11156bb3ba12673d42ae9d
parent9002400301979d01139a8f071cd082b8b6bc71c9
Merge PR #39855 into master

* 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>