]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33802 into master
authorSage Weil <sage@redhat.com>
Sun, 8 Mar 2020 21:49:38 +0000 (16:49 -0500)
committerSage Weil <sage@redhat.com>
Sun, 8 Mar 2020 21:49:38 +0000 (16:49 -0500)
* 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>
1  2 
src/pybind/mgr/cephadm/module.py

Simple merge