]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-rgw-static-website-yehuda' 7381/head
authorYehuda Sadeh <yehuda@redhat.com>
Wed, 27 Jan 2016 19:07:43 +0000 (11:07 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Wed, 27 Jan 2016 19:07:43 +0000 (11:07 -0800)
commitbf9d1a067a3c3baeb50744e089c2d73d11c3e68b
tree70b68a9136f8875d1a8155e464202586dfd97549
parentab3e1c6bebd27ae2329f1ca0b2b6a8703c98c764
parent056a10cca29763b4180bef89e88aa1a1b5bdcb57
Merge branch 'wip-rgw-static-website-yehuda'

Conflicts:
src/rgw/rgw_common.h
src/rgw/rgw_op.h
src/rgw/rgw_rest_s3.cc
src/rgw/rgw_rest_s3.h
14 files changed:
src/CMakeLists.txt
src/common/Makefile.am
src/common/config_opts.h
src/os/kstore/KStore.cc
src/rgw/rgw_common.h
src/rgw/rgw_http_errors.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.h
src/rgw/rgw_rest_s3.cc
src/rgw/rgw_rest_s3.h
src/rgw/rgw_rest_swift.cc