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 18:00:41 -0800
commit5f92adca26b509aed5655e85ad53174fa7b574b9 (patch)
tree05e4e558793596dc1b7173700c955ddc9342ed58
parenta44df9343594099fecb3897df393249d3d1992e2 (diff)
downloadceph-5f92adca26b509aed5655e85ad53174fa7b574b9.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> (cherry picked from commit db99fb4417b87301a69cb37b00c35c838b77197e)
-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 bdba0e9c8f4..44dccbb0a6a 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -1470,8 +1470,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);
}
@@ -1480,8 +1480,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);
}