diff options
| author | Sage Weil <sage@inktank.com> | 2013-09-07 14:11:00 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-09-07 14:11:00 -0700 |
| commit | b2caa799d693ca1a963667ed003cb6c670cc586d (patch) | |
| tree | 5ce599f098cbb8c0021dbc4299eebc1a61b6041a | |
| parent | 49dfb6cedffa04e853526f9c43f00a48a0ab508b (diff) | |
| parent | bc552647d4765a9c4ba08f1336059be498e0875b (diff) | |
| download | ceph-b2caa799d693ca1a963667ed003cb6c670cc586d.tar.gz | |
Merge remote-tracking branch 'gh/next'
| -rw-r--r-- | src/init-radosgw | 2 | ||||
| -rw-r--r-- | src/init-radosgw.sysv | 2 | ||||
| -rw-r--r-- | src/rgw/rgw_op.cc | 1 | ||||
| -rw-r--r-- | src/rgw/rgw_op.h | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/src/init-radosgw b/src/init-radosgw index a526441c3a0..de1e01e0018 100644 --- a/src/init-radosgw +++ b/src/init-radosgw @@ -83,7 +83,7 @@ case "$1" in echo "$RADOSGW is running." else echo "$RADOSGW is not running." - RETVAL=1 + exit 1 fi ;; *) diff --git a/src/init-radosgw.sysv b/src/init-radosgw.sysv index e08e1bd1b1b..017e3f9bc07 100644 --- a/src/init-radosgw.sysv +++ b/src/init-radosgw.sysv @@ -90,7 +90,7 @@ case "$1" in echo "$RADOSGW is running." else echo "$RADOSGW is not running." - RETVAL=1 + exit 1 fi ;; *) 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) {} |