]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Revert "Revert "Merge remote-tracking branch 'origin/wip-bi-sharding-3' into next""
authorYehuda Sadeh <yehuda@redhat.com>
Thu, 22 Jan 2015 01:30:32 +0000 (17:30 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Thu, 22 Jan 2015 01:30:32 +0000 (17:30 -0800)
commit6f44f7a0a9847e419ce2783164633efa71218380
treeded64c846bf4a006a9ccd55e2f7b17d4396dac6c
parent09c11071f8788b552355f7b24d07a4219afab4c4
Revert "Revert "Merge remote-tracking branch 'origin/wip-bi-sharding-3' into next""

Following a merge of next to master, the feature got reverted (because
it was reverted on next). Undoing.

This reverts commit 6613358ddc5339c8e33c409387fd6044db0b6f26.
22 files changed:
src/cls/rgw/cls_rgw.cc
src/cls/rgw/cls_rgw_client.cc
src/cls/rgw/cls_rgw_client.h
src/common/config_opts.h
src/rgw/rgw_admin.cc
src/rgw/rgw_bucket.cc
src/rgw/rgw_bucket.h
src/rgw/rgw_common.cc
src/rgw/rgw_common.h
src/rgw/rgw_json_enc.cc
src/rgw/rgw_op.cc
src/rgw/rgw_quota.cc
src/rgw/rgw_rados.cc
src/rgw/rgw_rados.h
src/rgw/rgw_replica_log.cc
src/rgw/rgw_replica_log.h
src/rgw/rgw_rest_log.cc
src/rgw/rgw_rest_log.h
src/rgw/rgw_rest_replica_log.cc
src/rgw/rgw_rest_swift.cc
src/test/Makefile.am
src/test/cls_rgw/test_cls_rgw.cc