Merge pull request #7723 from tchaikov/wip-rgw-test

test/radosgw-admin: update the expected usage outputs Reviewed-by: Loic Dachary <ldachary@redhat.com>
ceph · Feb 22, 2016 · b8131f8 · b8131f8
2 parents 847c3eb + cf8483f
commit b8131f8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
@@ -223,7 +223,7 @@ void _usage()
   cout << "   --categories=<list>       comma separated list of categories, used in usage show\n";
   cout << "   --caps=<caps>             list of caps (e.g., \"usage=read, write; user=read\"\n";
   cout << "   --yes-i-really-mean-it    required for certain operations\n";
-  cout << "   --reset-regions           reset regionmap when regionmap update";
+  cout << "   --reset-regions           reset regionmap when regionmap update\n";
   cout << "\n";
   cout << "<date> := \"YYYY-MM-DD[ hh:mm:ss]\"\n";
   cout << "\nQuota options:\n";

diff --git a/src/test/cli/radosgw-admin/help.t b/src/test/cli/radosgw-admin/help.t
@@ -130,10 +130,11 @@
      --bucket-id=<bucket-id>
      --shard-id=<shard-id>     optional for mdlog list
                                required for: 
-                               mdlog trim
-                               replica mdlog get/delete
-                               replica datalog get/delete
+                                 mdlog trim
+                                 replica mdlog get/delete
+                                 replica datalog get/delete
      --metadata-key=<key>      key to retrieve metadata from with metadata get
+     --remote=<remote>         remote to pull period
      --parent=<id>             parent period id
      --period=<id>             period id
      --epoch=<number>          period epoch
@@ -174,8 +175,8 @@
      --categories=<list>       comma separated list of categories, used in usage show
      --caps=<caps>             list of caps (e.g., "usage=read, write; user=read"
      --yes-i-really-mean-it    required for certain operations
-     --reset-zonegroups        reset zonegroupmap when zonegroupmap update
- 
+     --reset-regions           reset regionmap when regionmap update
+  
   <date> := "YYYY-MM-DD[ hh:mm:ss]"
   
   Quota options:
@@ -197,4 +198,3 @@
     --version         show version and quit
 
   [1]
-