]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-user-quota-2'
authorYehuda Sadeh <yehuda@inktank.com>
Mon, 27 Jan 2014 19:27:56 +0000 (11:27 -0800)
committerYehuda Sadeh <yehuda@inktank.com>
Mon, 27 Jan 2014 19:29:14 +0000 (11:29 -0800)
commitcacdfd9165d32652bf82d3400c15485a89824a3d
tree13721e6df678e2df69340cb1a9441c89c79db11a
parent715586fed7112b606853df1b589247b68714ecde
parent9413a5196ea1e2b6f50218afb0aa5684d287c48b
Merge branch 'wip-user-quota-2'

Conflicts:
src/common/config_opts.h
src/rgw/rgw_common.h
src/rgw/rgw_json_enc.cc
src/rgw/rgw_quota.cc
src/rgw/rgw_rados.cc
src/rgw/rgw_rados.h
src/rgw/rgw_user.cc
src/rgw/rgw_user.h

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
21 files changed:
src/cls/Makefile.am
src/common/config_opts.h
src/rgw/Makefile.am
src/rgw/rgw_admin.cc
src/rgw/rgw_bucket.cc
src/rgw/rgw_bucket.h
src/rgw/rgw_cache.h
src/rgw/rgw_common.cc
src/rgw/rgw_common.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_quota.cc
src/rgw/rgw_rados.cc
src/rgw/rgw_rados.h
src/rgw/rgw_rest.h
src/rgw/rgw_user.cc
src/rgw/rgw_user.h
src/test/cli/radosgw-admin/help.t
src/test/encoding/types.h