]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33469 into master
authorSage Weil <sage@redhat.com>
Sat, 22 Feb 2020 14:13:06 +0000 (08:13 -0600)
committerSage Weil <sage@redhat.com>
Sat, 22 Feb 2020 14:13:06 +0000 (08:13 -0600)
* refs/pull/33469/head:
mgr/cephadm: fix upgrade ok-to-stop condition check

Reviewed-by: Michael Fritch <mfritch@suse.com>
1  2 
src/pybind/mgr/cephadm/module.py

Simple merge