From: Sage Weil <sage@redhat.com>
Date: Wed, 11 Dec 2019 21:49:04 +0000 (-0600)
Subject: Merge PR #32189 into master
X-Git-Tag: v15.1.0~545
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a5b3037050714514a7fbcac296897ca8671ef9a4;p=ceph.git

Merge PR #32189 into master

* refs/pull/32189/head:
	mgr/orchestrator_cli: set type for 'orchestrator' option

Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

a5b3037050714514a7fbcac296897ca8671ef9a4