From: Sage Weil <sage@redhat.com>
Date: Sat, 22 Feb 2020 14:13:06 +0000 (-0600)
Subject: Merge PR #33469 into master
X-Git-Tag: v15.1.1~309
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a3bea4256d857adace0bf16ca9b6b252fc775539;p=ceph.git

Merge PR #33469 into master

* refs/pull/33469/head:
	mgr/cephadm: fix upgrade ok-to-stop condition check

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

a3bea4256d857adace0bf16ca9b6b252fc775539