]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'origin/master' into wip-rgw-static-website-yehuda-2
authorYehuda Sadeh <yehuda@redhat.com>
Tue, 19 Jan 2016 19:01:24 +0000 (11:01 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Tue, 19 Jan 2016 19:01:24 +0000 (11:01 -0800)
commit5f61d36d7189052bcaf22ace1c604bb45f3721ae
tree4a945397ef5e235dcad39f69bf518b726aa31c09
parent1178271358fe691b017e4976244437e8fdf8e185
parentee757a966afa0425559b09e8a24fe095dcb7d0fc
Merge remote-tracking branch 'origin/master' into wip-rgw-static-website-yehuda-2

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Conflicts:
src/global/Makefile.am
src/rgw/rgw_common.cc
src/rgw/rgw_common.h
src/rgw/rgw_json_enc.cc
src/rgw/rgw_op.h
src/rgw/rgw_rest.cc
src/rgw/rgw_rest_s3.cc
src/tracing/Makefile.am
24 files changed:
src/CMakeLists.txt
src/common/Formatter.cc
src/common/Formatter.h
src/common/HTMLFormatter.cc
src/common/HTMLFormatter.h
src/common/Makefile.am
src/common/config_opts.h
src/global/Makefile.am
src/os/kstore/KStore.cc
src/rgw/Makefile.am
src/rgw/rgw_common.cc
src/rgw/rgw_common.h
src/rgw/rgw_formats.h
src/rgw/rgw_http_errors.h
src/rgw/rgw_json_enc.cc
src/rgw/rgw_main.cc
src/rgw/rgw_op.cc
src/rgw/rgw_op.h
src/rgw/rgw_rados.h
src/rgw/rgw_rest.cc
src/rgw/rgw_rest.h
src/rgw/rgw_rest_s3.cc
src/rgw/rgw_rest_s3.h
src/tracing/Makefile.am