From: Yehuda Sadeh Date: Mon, 14 Oct 2013 21:14:17 +0000 (-0700) Subject: Merge branch 'wip-rgw-quota' X-Git-Tag: v0.72-rc1~65 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7f0d644cb47394c7e2ff625ebfbef81a88af1e3b;p=ceph.git Merge branch 'wip-rgw-quota' Conflicts: src/test/cli/radosgw-admin/help.t Reviewed-by: Josh Durgin Signed-off-by: Yehuda Sadeh --- 7f0d644cb47394c7e2ff625ebfbef81a88af1e3b diff --cc src/test/cli/radosgw-admin/help.t index 2def60107dc6,417c04ee7778..4fe30b1cda71 --- a/src/test/cli/radosgw-admin/help.t +++ b/src/test/cli/radosgw-admin/help.t @@@ -116,10 -119,15 +119,16 @@@ := "YYYY-MM-DD[ hh:mm:ss]" + 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 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 + --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]