Skip to content

Website merge#6

Closed
bafna wants to merge 222 commits intohammer-jcsfrom
website-merge
Closed

Website merge#6
bafna wants to merge 222 commits intohammer-jcsfrom
website-merge

Conversation

@bafna
Copy link
Copy Markdown
Owner

@bafna bafna commented Jul 6, 2016

No description provided.

Shivanshu Goswami and others added 30 commits December 18, 2015 14:50
Changing the version
Update rgw_rest_s3.cc
Adding trans id in log messages .
Add aasemble config file to build ceph faster with parallelization.
Take bafna ceph and comment out role checking, then raise pull req
Commenting out role checking code
Squashing console integration changes for code review
Console integration changes

Slight tweeks to make token validation work

Update rgw_rest_s3.cc

Changing the version

Removing dead code before review

IAM latest API changes

IAM first non mock API
Squashing console integration changes for code review
Console integration changes

Slight tweeks to make token validation work

Update rgw_rest_s3.cc

Changing the version

Removing dead code before review

IAM latest API changes

IAM first non mock API

Update rgw_rest_s3.cc

Changing the version

Nonmock IAM API1 parsing logic change

Update rgw_main.cc

Adding trans id in log messages .

Create .aasemble.yml

Add aasemble config file to build ceph faster with parallelization.

Commenting out role checking

hammer_IAM_nonMock1_parselogic

changing API from s3tokens to sign auth

addressing bafnas comments

minute changes for debugging IAM non mock 1

IAM changed response JSON for non mock API 1

Fixed crash in token validation for console

hammer_IAM_nonMock1_parselogic
Actions for COPY and MULTIPART UPLOAD
Copy and multipart upload action strings
…llowed

Config parameter added for no of parts limit in multipart upload and checked while completing multipart upload
Signed-off-by: Abhishek Dixit dixitabhi@gmail.com
yehudasa and others added 28 commits June 17, 2016 22:24
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>

Conflicts:
	src/global/Makefile.am
We need to override all conditional request parameters in errordoc
fallback request, and serve a complete page always, never anything
conditional.

Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
This reverts commit 2b21e3c.

Conflicts:
	src/common/Formatter.cc
	src/common/JSONFormatter.h
	src/common/Makefile.am
	src/common/TableFormatter.h
	src/common/XMLFormatter.cc
	src/common/XMLFormatter.h
	src/rgw/rgw_rest.cc
	src/test/formatter.cc

Conflicts:
	ceph-object-corpus
	src/mds/MDSDaemon.cc
	src/mds/MDSRank.cc
	src/rocksdb
For clarity, RGW_REST_* should be renamed to RGW_PROTO_* in future.

For now, undo it to ease the merging speed for static-sites.

Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>

Conflicts:
	src/rgw/rgw_common.h
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
…xisting ones for website changes.

Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>

Conflicts:
	src/CMakeLists.txt
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
If op is bucket creation it should ignore ENOENT. Otherwise we should
make sure we return the appropriate error.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
Fixes: ceph#12352

Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>

Conflicts:
	src/rgw/rgw_rest_swift.cc
	src/rgw/rgw_rest_swift.h
delete getop, remove #warnings, add comments

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

Conflicts:
	src/rgw/rgw_op.cc
rgw_enable_static_website

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Support for the x-amz-website-redirect-location header was broken in the
feature merging of Jewel, as it previously depended on the error handler to
redirect, which was overkill. Simplify it to work.

Backport: jewel
Fixes: http://tracker.ceph.com/issues/15531
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>

Conflicts:
	src/rgw/rgw_rest_s3.cc
Fix more last minute breakage from merges, now has has a working ErrorDoc as
well as working double-fault. Also moves some s3website-specific code out of
the main S3 codepath.

Fixes: ceph#15532
Fixes: ceph#15555
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>

Conflicts:
	src/rgw/rgw_rest.cc
	src/rgw/rgw_rest_s3.cc
	src/rgw/rgw_rest_s3.h
	src/rgw/rgw_rest_s3website.h
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>

Conflicts:
	src/rgw/rgw_rest_s3.cc
When modifying rgw_enable_apis per RGW instance, such as for staticsites, you
can end up with RESTManager instance being null in some cases, which returns a
HTTP 405 MethodNotAllowed to all requests.

Example configuration to trigger the bug:
rgw_enable_apis = s3website

Backport: jewel
X-Note: Patch from Yehuda in private IRC discussion, 2016/05/20.
Fixes: http://tracker.ceph.com/issues/15973
Fixes: http://tracker.ceph.com/issues/15974
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
(cherry picked from commit 7c7a465)
@bafna bafna closed this Jul 6, 2016
bafna pushed a commit that referenced this pull request Oct 12, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.