]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #33359 into master
authorSage Weil <sage@redhat.com>
Wed, 19 Feb 2020 18:58:51 +0000 (12:58 -0600)
committerSage Weil <sage@redhat.com>
Wed, 19 Feb 2020 18:58:51 +0000 (12:58 -0600)
* refs/pull/33359/head:
mgr/dashboard/tests/test_orchestrator: disable service test
mgr/cephadm: fix race between check_hosts and host rm
mgr/volumes: fix remove_mds call
mgr/rook: hackly describe_service -> list_daemons
mgr/tests/test_orchestrator: fix ServiceDescription test
mgr/test_orchestrator: describe_service -> list_daemons
mgr/orch: resurrect ServiceDescription, 'orch ls'
qa/tasks/mgr/dashboard/test_orchestrator: disable services test

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

Trivial merge