From: Sage Weil <sage@redhat.com>
Date: Tue, 17 Dec 2019 16:59:26 +0000 (-0600)
Subject: Merge PR #32279 into master
X-Git-Tag: v15.1.0~455
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=92b0638efdfbcfdae2b928fe2dea201327eec469;p=ceph.git

Merge PR #32279 into master

* refs/pull/32279/head:
	mgr/orchestrator_cli: combine all host into one 'device ls' table
	python-common: 'ssd/nvme' -> 'ssd'
	mgr/orchestrator_cli: make 'device ls' table formatting consistent

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

92b0638efdfbcfdae2b928fe2dea201327eec469