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

Merge PR #33415 into master

* refs/pull/33415/head:
	mgr/cephadm: progress for upgrade

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

296c014f17f9e98f34e66dd25417df04ac29902b