From: Sage Weil <sage@redhat.com>
Date: Wed, 18 Mar 2020 22:42:10 +0000 (-0500)
Subject: Merge PR #34001 into octopus
X-Git-Tag: v15.2.0~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=08571b790b64833efd83328b16caca4f1042d6f6;p=ceph.git

Merge PR #34001 into octopus

* refs/pull/34001/head:
	mgr/cephadm: pytest: Enable SpecStore
	mgr/orchestrator: add test for default implementation for apply()
	python-common: validate ServiceSpec.service_type
	fixup mgr/cephadm: Fix ceph orch apply -i
	mgr/dashbaord: orchestrator service: Revert wait_api_result to a single completion
	mgr/orchestrator: `orch daemon add` accepts a yaml
	mgr/cephadm: apply_drivegroups() returns a single Completion
	mgr/cephadm: remove `trivial_result()`
	mgr/cephadm: Fix `ceph orch apply -i`

Reviewed-by: Sage Weil <sage@redhat.com>
---

08571b790b64833efd83328b16caca4f1042d6f6