From: Yehuda Sadeh Date: Tue, 10 May 2016 15:28:37 +0000 (-0700) Subject: Merge pull request #9016 from yehudasa/wip-rgw-admin-modify-jewel X-Git-Tag: v10.2.1~45 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6f23218bbcee8190acfdf0ae7b76e6e742015d91;p=ceph.git Merge pull request #9016 from yehudasa/wip-rgw-admin-modify-jewel jewel: radosgw-admin: update usage for zone[group] modify --- 6f23218bbcee8190acfdf0ae7b76e6e742015d91 diff --cc src/rgw/rgw_admin.cc index 182b8510babb,41b0b012c9f7..4e34a4aeefd1 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@@ -101,9 -101,8 +101,9 @@@ void _usage( cout << " zonegroup default set default zone group\n"; cout << " zonegroup delete delete a zone group info\n"; cout << " zonegroup get show zone group info\n"; - cout << " zonegroup modify set/clear zonegroup master status\n"; + cout << " zonegroup modify modify an existing zonegroup\n"; cout << " zonegroup set set zone group info (requires infile)\n"; + cout << " zonegroup remove remove a zone from a zonegroup\n"; cout << " zonegroup rename rename a zone group\n"; cout << " zonegroup list list all zone groups set on this cluster\n"; cout << " zonegroup-map get show zonegroup-map\n"; diff --cc src/test/cli/radosgw-admin/help.t index d3569703fe81,2760371f5e1c..afb665872b07 --- a/src/test/cli/radosgw-admin/help.t +++ b/src/test/cli/radosgw-admin/help.t @@@ -53,9 -53,8 +53,9 @@@ zonegroup default set default zone group zonegroup delete delete a zone group info zonegroup get show zone group info - zonegroup modify set/clear zonegroup master status + zonegroup modify modify an existing zonegroup zonegroup set set zone group info (requires infile) + zonegroup remove remove a zone from a zonegroup zonegroup rename rename a zone group zonegroup list list all zone groups set on this cluster zonegroup-map get show zonegroup-map