]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #40735 into master
authorSage Weil <sage@newdream.net>
Wed, 14 Apr 2021 13:53:31 +0000 (09:53 -0400)
committerSage Weil <sage@newdream.net>
Wed, 14 Apr 2021 13:53:31 +0000 (09:53 -0400)
commitff97629375a4a4e82b79f0fdcdb25f411b74d48d
tree888001243b610e54df622055c4a1ae164d014463
parent8cc5dc75d7a21fd6499d484ef9310cc7df4426e4
parentc0803f8f271ea6b2c653b3a443f7807185303912
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>
src/pybind/mgr/orchestrator/module.py
src/python-common/ceph/deployment/service_spec.py