From: Sage Weil <sage@redhat.com>
Date: Tue, 11 Feb 2020 16:42:58 +0000 (-0600)
Subject: Merge PR #33175 into master
X-Git-Tag: v15.1.1~466
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=02aeeb0dacf6fe611b2b687ba2f74ef9c737ab6e;p=ceph.git

Merge PR #33175 into master

* refs/pull/33175/head:
	mgr/cephadm: Add some more type annotations
	mgr/orchestrator: unify StatelessServiceSpec and StatefulServiceSpec

Reviewed-by: Sage Weil <sage@redhat.com>
---

02aeeb0dacf6fe611b2b687ba2f74ef9c737ab6e