From: Sage Weil <sage@redhat.com>
Date: Sun, 8 Mar 2020 21:38:15 +0000 (-0500)
Subject: Merge PR #33795 into master
X-Git-Tag: v15.1.1~70
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6d5c758117b24ee3d4bec85b0bc143bf0c1c13fa;p=ceph.git

Merge PR #33795 into master

* refs/pull/33795/head:
	mgr/orch: collapse 'SPEC' and 'PLACEMENT' columns in 'orch ls'

Reviewed-by: Michael Fritch <mfritch@suse.com>
---

6d5c758117b24ee3d4bec85b0bc143bf0c1c13fa