From: Sage Weil <sage@redhat.com>
Date: Fri, 6 Mar 2020 15:21:53 +0000 (-0600)
Subject: Merge PR #33784 into master
X-Git-Tag: v15.1.1~88
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=cab7eca926f4731876d9561115f3d1e22b4bf5c6;p=ceph.git

Merge PR #33784 into master

* refs/pull/33784/head:
	mgr/cephadm: update type annotation

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

cab7eca926f4731876d9561115f3d1e22b4bf5c6