]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #34061 into master
authorSage Weil <sage@redhat.com>
Sun, 29 Mar 2020 12:17:37 +0000 (07:17 -0500)
committerSage Weil <sage@redhat.com>
Sun, 29 Mar 2020 12:17:37 +0000 (07:17 -0500)
* 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>
1  2 
src/pybind/mgr/cephadm/module.py

Simple merge