From: Sage Weil <sage@redhat.com>
Date: Tue, 3 Mar 2020 21:59:33 +0000 (-0600)
Subject: Merge PR #33667 into master
X-Git-Tag: v15.1.1~142
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f8bd9a7dddf2a328b28860c9f10cb6ab80bc95ab;p=ceph.git

Merge PR #33667 into master

* refs/pull/33667/head:
	mgr/orch: show placement in 'orch ls'
	mgr/orch: fix SPEC alignment in 'orch ls'
	mgr/orch: include spec ref in ServiceDescription

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

f8bd9a7dddf2a328b28860c9f10cb6ab80bc95ab