]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #32384 into master
authorSage Weil <sage@redhat.com>
Sat, 21 Dec 2019 14:21:04 +0000 (08:21 -0600)
committerSage Weil <sage@redhat.com>
Sat, 21 Dec 2019 14:21:04 +0000 (08:21 -0600)
* refs/pull/32384/head:
qa/tasks/mgr/test_orchestrator_cli: fix device ls test
mgr/orchestrator_cli: no need for colored=False

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

Trivial merge