Merge branch 'wip-rgw-quota'

Conflicts:
	src/test/cli/radosgw-admin/help.t

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/rgw/rgw_metadata.cc
Simple merge

diff --cc src/rgw/rgw_rados.cc
Simple merge

diff --cc src/test/cli/radosgw-admin/help.t
index 2def60107dc6e0d59fd11653fed9ed64a59ae1b7,417c04ee77782983fea88c031ffb21e675740efc..4fe30b1cda71faf667173fef891a892ae14b313f
--- 1/src/test/cli/radosgw-admin/help.t
--- 2/src/test/cli/radosgw-admin/help.t
+++ b/src/test/cli/radosgw-admin/help.t
@@@ -116,10 -119,15 +119,16 @@@
    
    <date> := "YYYY-MM-DD[ hh:mm:ss]"
    
 -    --conf/-c        Read configuration from the given configuration file
 -    --id/-i          set ID portion of my name
 -    --name/-n        set name (TYPE.ID)
 -    --version        show version and quit
+   Quota options:
+      --bucket                  specified bucket for quota command
+      --max-objects             specify max objects
+      --max-size                specify max size (in bytes)
+      --quota-scope             scope of quota (bucket, user)
+   
 +    --conf/-c FILE    read configuration from the given configuration file
 +    --id/-i ID        set ID portion of my name
 +    --name/-n TYPE.ID set name
 +    --cluster NAME    set cluster name (default: ceph)
 +    --version         show version and quit
    
    [1]