From: Sage Weil <sage@redhat.com>
Date: Sun, 8 Mar 2020 21:49:38 +0000 (-0500)
Subject: Merge PR #33802 into master
X-Git-Tag: v15.1.1~68
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6b0463cae5eb9728eae8ebd83fc492f1ec188fbf;p=ceph.git

Merge PR #33802 into master

* refs/pull/33802/head:
	mgr/cephadm: sanity check upgrade version
	mgr/cephadm: only need to invalidate once here
	mgr/cephadm: upgrade requires root mode for now

Reviewed-by: Michael Fritch <mfritch@suse.com>
---

6b0463cae5eb9728eae8ebd83fc492f1ec188fbf