]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #33118 into master
authorSage Weil <sage@redhat.com>
Fri, 7 Feb 2020 19:27:34 +0000 (13:27 -0600)
committerSage Weil <sage@redhat.com>
Fri, 7 Feb 2020 19:27:34 +0000 (13:27 -0600)
commita868e3a763501cb21a20cd340f568d3faa4e8380
tree740353e9946283e31ecaacf72b575f0a8eb41dcd
parente46a37195a4069befb68951b9691278e899cf22e
parentd4bb86dc77deb7c523bcfbe922f5a918add4d94f
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>
src/pybind/mgr/orchestrator_cli/module.py