From: Sage Weil <sage@redhat.com>
Date: Sun, 19 Jan 2020 17:38:22 +0000 (-0600)
Subject: Merge PR #32006 into master
X-Git-Tag: v15.1.0~171
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0e56cb0dda83dfb8b3d04d67c11d2db94e089f1c;p=ceph.git

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>
---

0e56cb0dda83dfb8b3d04d67c11d2db94e089f1c