From: Sage Weil <sage@redhat.com>
Date: Sun, 29 Mar 2020 12:17:37 +0000 (-0500)
Subject: Merge PR #34061 into master
X-Git-Tag: v17.0.0~2786
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=48b6cc6182bc0691c2a6d284ef6d5083ed2afa58;p=ceph.git

Merge PR #34061 into master

* refs/pull/34061/head:
	mgr/orch: Add `ceph orch ls --export`
	mgr/dashboard: adapt to new `ServiceDescription.to_json()`
	python-common: add `service_name` to `ServiceSpec.to_json`
	python-common: make ServiceSpec and ServiceDescription compatible
	src/ceph.in: add yaml to known formats
	mgr/orch: add yaml to `orch ls`
	mgr/orch: remove `orch spec dump`
	python-common: reorder RGWSpec arguments
	python-common: prevent ServiceSpec of wrong type
	pybind/mgr: tox.ini: omit cov report
	mgr/cephadm: test describe_service
	mgr/orch: ServiceDescription: change json representation
	mgr/orch: ServiceDescription: Make spec a requirement

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

48b6cc6182bc0691c2a6d284ef6d5083ed2afa58