Skip to content

Website merge#4

Open
bafna wants to merge 86 commits intohammer-upfrom
website-merge
Open

Website merge#4
bafna wants to merge 86 commits intohammer-upfrom
website-merge

Conversation

@bafna
Copy link
Copy Markdown
Owner

@bafna bafna commented Jul 5, 2016

No description provided.

harshalgupta and others added 30 commits April 22, 2016 15:06
Final API logging of incoming request and outgoing response
commit eb075aa
Author: root <rahul.1aggarwal@gmail.com>
Date:   Wed May 25 18:43:05 2016 +0530

    Adding back comment

commit ccbefbe
Author: root <rahul.1aggarwal@gmail.com>
Date:   Wed May 25 16:33:46 2016 +0530

    JOS-98 : RGW crashes when DELETE is done concurrently
    - providing threading functions for openssl to support multithreading
Adding rgw exposed headers for console mutipart upload
Adding exposed header for Options request also
JOS-98: RGW crashes when DELETE is done concurrently
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>
bafna and others added 30 commits June 28, 2016 20:57
JOS-106: Rename operation without testing code
Adding allowed headers for console sse
Fixing memory leaks and adding debug log messages
…efix in x-jcs/x-amz type headers are replaced with 'x-amz'.

Because of this x-jcs headers are not passed as it is and causes an issue in creating cannonical string for authentication with IAM.
Fix: 1. Added x-jcs in the mix with other x-* type headers so that it wont be ignored.
     2. We are retaining original prefix and not replacing it with x-amz.
Adding a header for encrypted objects Get/Head Ops
adding error code for wrong encryption header
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.

6 participants