From: Sage Weil <sage@redhat.com>
Date: Mon, 16 Mar 2020 22:36:17 +0000 (-0500)
Subject: Merge PR #33955 into octopus
X-Git-Tag: v15.2.0~38
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ae9915f87a5f782be5dba36c402dbf0f5581893a;p=ceph.git

Merge PR #33955 into octopus

* refs/pull/33955/head:
	mgr/cephadm: respect 'unmanaged' flag in spec
	mgr/orch: orch ls: show <no spec> or <unmanaged> as appropriate
	mgr/orch: orch ls: rename SPEC -> PLACEMENT
	mgr/orch: add 'unmanaged' property to ServiceSpec
	mgr/orch: combine 'orch daemon add <type> ...' into one command
	mgr/orch: combine 'orch apply <type> [<placement>]' into one command

Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

ae9915f87a5f782be5dba36c402dbf0f5581893a