From: Sage Weil <sage@redhat.com>
Date: Fri, 7 Feb 2020 19:27:34 +0000 (-0600)
Subject: Merge PR #33118 into master
X-Git-Tag: v15.1.1~509
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a868e3a763501cb21a20cd340f568d3faa4e8380;p=ceph-ci.git

Merge PR #33118 into master

* refs/pull/33118/head:
	orchestrator cli: change 'rgw update' params order
	mgr/cephadm: fix minor typo

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

a868e3a763501cb21a20cd340f568d3faa4e8380