From: Sage Weil <sage@redhat.com>
Date: Sat, 21 Dec 2019 14:21:04 +0000 (-0600)
Subject: Merge PR #32384 into master
X-Git-Tag: v15.1.0~401
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e0170aa2264e738a085f796f123db74bb2f359d3;p=ceph.git

Merge PR #32384 into master

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

e0170aa2264e738a085f796f123db74bb2f359d3