]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2dc112e bb126cf)
Merge PR #33531 into master
authorSage Weil <sage@redhat.com>
Thu, 5 Mar 2020 19:20:21 +0000 (13:20 -0600)
committerSage Weil <sage@redhat.com>
Thu, 5 Mar 2020 19:20:21 +0000 (13:20 -0600)
* refs/pull/33531/head:
qa/tasks/mgr/test_orchestrator_cli: fix test_ps* tests
mgr/test_orchestrator: refactor listing services/daemons
mgr/dashboard: list services and daemons

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
1  2 
qa/tasks/mgr/test_orchestrator_cli.py patch | diff1 | diff2 | blob | history

diff --cc qa/tasks/mgr/test_orchestrator_cli.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.