]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ac168e3 12a55d6)
Merge remote-tracking branch 'origin/master' into wip-rgw-new-multisite
authorYehuda Sadeh <yehuda@redhat.com>
Fri, 19 Feb 2016 01:14:07 +0000 (17:14 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Fri, 19 Feb 2016 01:14:07 +0000 (17:14 -0800)
commit4d494d5b05a1dc6b41b858eeb293394592abf60c
tree9445d8d330b9d53808886ba6b745b12b201e6519tree | snapshot
parentac168e3f00fe90f79907ee814ad4043e4f43ab3fcommit | diff
parent12a55d6b1af16a41a590b56890aa541205a43abccommit | diff
Merge remote-tracking branch 'origin/master' into wip-rgw-new-multisite

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Conflicts:
src/CMakeLists.txt
src/rgw/Makefile.am
src/rgw/rgw_admin.cc
src/rgw/rgw_common.h
src/rgw/rgw_main.cc
src/rgw/rgw_op.cc
src/rgw/rgw_rados.h
src/rgw/rgw_rest_s3.cc
src/test/Makefile-client.am
34 files changed:
CMakeLists.txt diff1 | diff2 | blob | history
src/CMakeLists.txt diff1 | diff2 | blob | history
src/common/config_opts.h diff1 | diff2 | blob | history
src/rgw/Makefile.am diff1 | diff2 | blob | history
src/rgw/librgw.cc diff1 | diff2 | blob | history
src/rgw/rgw_admin.cc diff1 | diff2 | blob | history
src/rgw/rgw_bucket.cc diff1 | diff2 | blob | history
src/rgw/rgw_bucket.h diff1 | diff2 | blob | history
src/rgw/rgw_civetweb_frontend.cc | diff2 | blob | history
src/rgw/rgw_common.cc diff1 | diff2 | blob | history
src/rgw/rgw_common.h diff1 | diff2 | blob | history
src/rgw/rgw_frontend.h | diff2 | blob | history
src/rgw/rgw_lib.h | diff2 | blob | history
src/rgw/rgw_log.cc diff1 | diff2 | blob | history
src/rgw/rgw_main.cc 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.h | diff2 | blob | history
src/rgw/rgw_rados.cc diff1 | diff2 | blob | history
src/rgw/rgw_rados.h diff1 | diff2 | blob | history
src/rgw/rgw_rest.cc diff1 | diff2 | blob | history
src/rgw/rgw_rest.h diff1 | diff2 | blob | history
src/rgw/rgw_rest_config.h diff1 | diff2 | blob | history
src/rgw/rgw_rest_log.h diff1 | diff2 | blob | history
src/rgw/rgw_rest_realm.cc diff1 | | blob | history
src/rgw/rgw_rest_realm.h diff1 | | blob | history
src/rgw/rgw_rest_s3.cc diff1 | diff2 | blob | history
src/rgw/rgw_rest_s3.h diff1 | diff2 | blob | history
src/rgw/rgw_rest_swift.cc diff1 | diff2 | blob | history
src/rgw/rgw_user.cc diff1 | diff2 | blob | history
src/rgw/rgw_user.h diff1 | diff2 | blob | history
src/test/CMakeLists.txt diff1 | diff2 | blob | history
src/test/Makefile-client.am diff1 | diff2 | blob | history
src/test/cli/radosgw-admin/help.t diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.