]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3a8f964 1189094)
Merge PR #33955 into octopus
authorSage Weil <sage@redhat.com>
Mon, 16 Mar 2020 22:36:17 +0000 (17:36 -0500)
committerSage Weil <sage@redhat.com>
Mon, 16 Mar 2020 22:36:17 +0000 (17:36 -0500)
commitae9915f87a5f782be5dba36c402dbf0f5581893a
treee6a12322406e5765bd078467c73cc532436b7686tree | snapshot
parent3a8f964d7d104d0489c61d2322a3c9c029d6be2acommit | diff
parent11890948ab8236c5856c619d98158eba5b24423acommit | diff
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>
src/pybind/mgr/cephadm/module.py diff1 | diff2 | blob | history
src/pybind/mgr/orchestrator/module.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.