From: Sage Weil <sage@redhat.com>
Date: Fri, 21 Feb 2020 12:31:46 +0000 (-0600)
Subject: Merge PR #33447 into master
X-Git-Tag: v15.1.1~331
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eed0f96a8aa88b5394daf4c62195ec2d25bac2e0;p=ceph.git

Merge PR #33447 into master

* refs/pull/33447/head:
	mgr/cephadm: fix upgrade wait loop

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

eed0f96a8aa88b5394daf4c62195ec2d25bac2e0