]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a646103 ce42172)
Merge remote-tracking branch 'jmunhoz/wip-aws4' into wip-aws4 7720/head
authorYehuda Sadeh <yehuda@redhat.com>
Fri, 19 Feb 2016 22:34:13 +0000 (14:34 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Fri, 19 Feb 2016 22:34:13 +0000 (14:34 -0800)
commit552715995ce15aec5ffcdb562e9ebe799c0b9497
treef8d5a6f92f8ee5abc3ab8dc40ae847af9ca4b643tree | snapshot
parenta646103edea99495e935d13236521653eb04bae7commit | diff
parentce421725cd323439f3aa03e3bf68ff0eb6c3eb67commit | diff
Merge remote-tracking branch 'jmunhoz/wip-aws4' into wip-aws4

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Conflicts:
src/rgw/rgw_auth_s3.h
src/rgw/rgw_client_io.cc
src/rgw/rgw_client_io.h
src/rgw/rgw_common.h
src/rgw/rgw_main.cc
src/rgw/rgw_op.cc
src/rgw/rgw_op.h
src/rgw/rgw_rest.cc
src/rgw/rgw_rest_metadata.cc
src/rgw/rgw_rest_s3.cc
16 files changed:
src/rgw/rgw_auth_s3.cc diff1 | diff2 | blob | history
src/rgw/rgw_auth_s3.h diff1 | diff2 | blob | history
src/rgw/rgw_client_io.cc diff1 | diff2 | blob | history
src/rgw/rgw_client_io.h diff1 | diff2 | blob | history
src/rgw/rgw_common.cc diff1 | diff2 | blob | history
src/rgw/rgw_common.h diff1 | diff2 | blob | history
src/rgw/rgw_http_errors.h diff1 | diff2 | blob | history
src/rgw/rgw_op.cc diff1 | diff2 | blob | history
src/rgw/rgw_op.h diff1 | diff2 | blob | history
src/rgw/rgw_process.cc diff1 | | blob | history
src/rgw/rgw_rest.cc diff1 | diff2 | blob | history
src/rgw/rgw_rest.h diff1 | diff2 | blob | history
src/rgw/rgw_rest_metadata.cc diff1 | diff2 | blob | history
src/rgw/rgw_rest_metadata.h diff1 | diff2 | blob | history
src/rgw/rgw_rest_s3.cc diff1 | diff2 | blob | history
src/rgw/rgw_rest_s3.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.