]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
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)
commit0e56cb0dda83dfb8b3d04d67c11d2db94e089f1c
treeb3dbb29488ad41b4ceed1958af0efa7ebc33baf6
parent305d4071fabe455ce3604bf24864517edd3bcfe9
parentc66371764584750c825c11ecddd345b97f0bb502
Merge PR #32006 into master

* 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>
src/cephadm/cephadm
src/pybind/mgr/cephadm/module.py