From: Sage Weil <sage@newdream.net>
Date: Fri, 29 Dec 2017 18:01:18 +0000 (-0600)
Subject: Merge branch 'master' into wip-doc-radosgw-admin-max-buckets
X-Git-Tag: v13.0.2~690^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cb43b4f9744aad87146322fb1fa82c386efc2c2f;p=ceph.git

Merge branch 'master' into wip-doc-radosgw-admin-max-buckets
---

cb43b4f9744aad87146322fb1fa82c386efc2c2f
diff --cc doc/man/8/radosgw-admin.rst
index 17bcbdb0d8ea,b883176a8d6d..541e6b437ef6
--- a/doc/man/8/radosgw-admin.rst
+++ b/doc/man/8/radosgw-admin.rst
@@@ -312,14 -507,26 +507,31 @@@ Option
  
  	Temporary url key.
  
 +.. option:: --max-buckets
 +
 +	max number of buckets for a user (0 for no limit, negative value to disable bucket creation).
 +	Default is 1000.
 +
+ .. option:: --access=<access>
+ 
+    Set the access permissions for the sub-user.
+    Available access permissions are read, write, readwrite and full.
+ 
+ .. option:: --display-name=<name>
+ 
+    The display name of the user.
+ 
+ .. option:: --max-buckets
+ 
+    Maximum number of buckets for a user.
+ 
+ .. option:: --admin
+ 
+    Set the admin flag on the user.
+ 
  .. option:: --system
  
- 	Set the system flag on the user.
+    Set the system flag on the user.
  
  .. option:: --bucket=bucket