]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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>
1  2 
src/pybind/mgr/cephadm/module.py patch | diff1 | diff2 | blob | history
src/pybind/mgr/orchestrator/module.py patch | diff1 | diff2 | blob | history

diff --cc src/pybind/mgr/cephadm/module.py
Simple merge
diff --cc src/pybind/mgr/orchestrator/module.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.