]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #32006 into master
authorSage Weil <sage@redhat.com>
Sun, 19 Jan 2020 17:38:22 +0000 (11:38 -0600)
committerSage Weil <sage@redhat.com>
Sun, 19 Jan 2020 17:38:22 +0000 (11:38 -0600)
* refs/pull/32006/head:
mgr/cephadm: revert to OrchestratorClientMixin child
mgr/cephadm: initial upgrade logic
cephadm: return 'cephadm pull' result as JSON
mgr/cephadm: upgrade start/stop/pause/resume
mgr/cephadm: track ceph version as well as container in on 'upgrade check'
mgr/orchestrator_cli: upgrade {start,pause,resume,stop}
mgr/cephadm: fix upgrade check
mon/ConfigKeyService: remove config-key set warning

Reviewed-by: Sebastian Wagner <swagner@suse.com>
1  2 
src/cephadm/cephadm
src/pybind/mgr/cephadm/module.py

Simple merge
Simple merge