]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8eec3d7 fd35ad0)
Merge pull request #8669 from dreamhost/wip-15532
authorYehuda Sadeh <yehuda@redhat.com>
Wed, 18 May 2016 23:36:10 +0000 (16:36 -0700)
committerYehuda Sadeh <yehuda@redhat.com>
Wed, 18 May 2016 23:36:10 +0000 (16:36 -0700)
rgw/s3website: ErrorDoc & Double-fault support

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
1  2 
src/rgw/rgw_rest.cc patch | diff1 | diff2 | blob | history
src/rgw/rgw_rest_s3.cc patch | diff1 | diff2 | blob | history

diff --cc src/rgw/rgw_rest.cc
Simple merge
diff --cc src/rgw/rgw_rest_s3.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.