]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
rgw: catch up aws4 with the new features 4943/head
authorJavier M. Mellid <jmunhoz@igalia.com>
Sun, 14 Feb 2016 12:26:02 +0000 (13:26 +0100)
committerJavier M. Mellid <jmunhoz@igalia.com>
Sun, 14 Feb 2016 12:26:02 +0000 (13:26 +0100)
commitce421725cd323439f3aa03e3bf68ff0eb6c3eb67
treed3c349a36b288e7b1c02ae34563b85e044a70776
parente9917a66d42b1900c0ce73f6748e9bc5187d8cd0
rgw: catch up aws4 with the new features

Fix pending conflicts after massive merging. It catches up with SLO, bucket
website, bulk deletes and payment request features.

Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
src/rgw/rgw_common.h
src/rgw/rgw_op.cc
src/rgw/rgw_rest_s3.cc