From: Sage Weil <sage@newdream.net>
Date: Wed, 14 Apr 2021 13:53:31 +0000 (-0400)
Subject: Merge PR #40735 into master
X-Git-Tag: v17.1.0~2264
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ff97629375a4a4e82b79f0fdcdb25f411b74d48d;p=ceph.git

Merge PR #40735 into master

* refs/pull/40735/head:
	mgr/orchestractor: rgw realm and zone flags must both be provided

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>
---

ff97629375a4a4e82b79f0fdcdb25f411b74d48d