]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33541 into master
authorSage Weil <sage@redhat.com>
Sun, 1 Mar 2020 22:55:06 +0000 (16:55 -0600)
committerSage Weil <sage@redhat.com>
Sun, 1 Mar 2020 22:55:06 +0000 (16:55 -0600)
* refs/pull/33541/head:
mgr/test_orchestrator: add daemon_action
qa/tasksmgr/test_orchestrator_cli: fix test_service_action
qa/tasks/test_orchestrator_cli: disable test_osd_create exception check
mgr/test_orchestrator: update_foo -> apply_foo
mgr/test_orchestrator: add force flag to remove_daemons
qa/tasks/mgr/test_orchestrator_cli: update
qa/tasks/mgr/test_orchestrator_cli: fix test_load_data
mgr/test_orchestrator: fix list_daemons

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Sebastian Wagner <swagner@suse.com>

Trivial merge