summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYehuda Sadeh <yehuda@inktank.com>2013-09-06 22:33:38 -0700
committerYehuda Sadeh <yehuda@inktank.com>2013-09-11 09:47:34 -0700
commit670db7e80ddc9c26c43a4f66907a5996ce207c4d (patch)
tree3f9f70b5a72a857bbd68e88ab2dd4bbb7e441d41
parenta304016fa01b02efd500135c00b9bf3407a9999c (diff)
downloadceph-670db7e80ddc9c26c43a4f66907a5996ce207c4d.tar.gz
rgw: fix get cors, delete cors
Remove a couple of variables that overrode class member. Not really clear how it was working before, might have been a bad merge / rebase. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com> (cherry picked from commit 13872785aeeddbe1b8dd97e49fd6a2d879514f8d)
-rw-r--r--src/rgw/rgw_op.cc1
-rw-r--r--src/rgw/rgw_op.h1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index b5ed3e7fd6f..114b8709a22 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -1994,7 +1994,6 @@ int RGWDeleteCORS::verify_permission()
void RGWDeleteCORS::execute()
{
- RGWCORSConfiguration bucket_cors;
ret = read_bucket_cors();
if (ret < 0)
return;
diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h
index 241584bac68..948a11830c2 100644
--- a/src/rgw/rgw_op.h
+++ b/src/rgw/rgw_op.h
@@ -531,7 +531,6 @@ public:
class RGWGetCORS : public RGWOp {
protected:
int ret;
- RGWCORSConfiguration bucket_cors;
public:
RGWGetCORS() : ret(0) {}