]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commitd66cc42d7e865b9ce05e08b02247f86c757d248d
tree34f738effb6e1571c75e78d0378403c4bdb81fee
parent6f76cde053de9a722810c5f9ff6a0af1713b65e3
parent1e2400fe3b81461ac67c5658711971f48e1d587a
Merge PR #33359 into master

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