summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYehuda Sadeh <yehuda@inktank.com>2013-02-18 09:10:43 -0800
committerYehuda Sadeh <yehuda@inktank.com>2013-02-19 17:59:09 -0800
commitdb99fb4417b87301a69cb37b00c35c838b77197e (patch)
tree2426f62001da8ab1c681e5347efb8359e96da52e
parent34f885be536d0ac89c10fd29b1518751d2ffc547 (diff)
downloadceph-db99fb4417b87301a69cb37b00c35c838b77197e.tar.gz
rgw: fix multipart uploads listing
Fixes: #4177 Backport: bobtail Listing multipart uploads had a typo, and was requiring the wrong resource (uploadId instead of uploads). Signed-off-by: Yehuda Sadeh <yehuda@inktank.com> Reviewed-by: Greg Farnum <greg@inktank.com>
-rw-r--r--src/rgw/rgw_rest_s3.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index f5a7281f5ba..bbcceb827ac 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -1483,8 +1483,8 @@ RGWOp *RGWHandler_ObjStore_Bucket_S3::op_get()
return new RGWGetBucketLogging_ObjStore_S3;
if (is_acl_op()) {
return new RGWGetACLs_ObjStore_S3;
- } else if (s->args.exists("uploadId")) {
- return new RGWListMultipart_ObjStore_S3;
+ } else if (s->args.exists("uploads")) {
+ return new RGWListBucketMultiparts_ObjStore_S3;
}
return get_obj_op(true);
}
@@ -1493,8 +1493,8 @@ RGWOp *RGWHandler_ObjStore_Bucket_S3::op_head()
{
if (is_acl_op()) {
return new RGWGetACLs_ObjStore_S3;
- } else if (s->args.exists("uploadId")) {
- return new RGWListMultipart_ObjStore_S3;
+ } else if (s->args.exists("uploads")) {
+ return new RGWListBucketMultiparts_ObjStore_S3;
}
return get_obj_op(false);
}