radosgw-admin: update usage for zone[group] modify

the help strings indicated that only --master could be changed

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 410d432d11541a29c3fd4608a070cecf8dc2766e)

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 3e4bcba2790b6dbbbaf9402271ffb9c4e780e805..41b0b012c9f739f7dcfc2b7576bc26f506d0bf95 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -101,7 +101,7 @@ 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 rename           rename a zone group\n";
   cout << "  zonegroup list             list all zone groups set on this cluster\n";
@@ -110,7 +110,7 @@ void _usage()
   cout << "  zone create                create a new zone\n";
   cout << "  zone delete                delete a zone\n";
   cout << "  zone get                   show zone cluster params\n";
-  cout << "  zone modify                set/clear zone master status\n";
+  cout << "  zone modify                modify an existing zone\n";
   cout << "  zone set                   set zone cluster params (requires infile)\n";
   cout << "  zone list                  list all zones set on this cluster\n";
   cout << "  pool add                   add an existing pool for data placement\n";

diff --git a/src/test/cli/radosgw-admin/help.t b/src/test/cli/radosgw-admin/help.t
index 5867f00c6349cc0ffbdfe70bcf66c726ef9af1ee..2760371f5e1c73537cbde670ef51533f9ba9ae63 100644 (file)
--- a/src/test/cli/radosgw-admin/help.t
+++ b/src/test/cli/radosgw-admin/help.t
@@ -53,7 +53,7 @@
     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 rename           rename a zone group
     zonegroup list             list all zone groups set on this cluster
@@ -62,7 +62,7 @@
     zone create                create a new zone
     zone delete                delete a zone
     zone get                   show zone cluster params
-    zone modify                set/clear zone master status
+    zone modify                modify an existing zone
     zone set                   set zone cluster params (requires infile)
     zone list                  list all zones set on this cluster
     pool add                   add an existing pool for data placement