]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-rgw-quota'
authorYehuda Sadeh <yehuda@inktank.com>
Mon, 14 Oct 2013 21:14:17 +0000 (14:14 -0700)
committerYehuda Sadeh <yehuda@inktank.com>
Mon, 14 Oct 2013 21:14:17 +0000 (14:14 -0700)
commit7f0d644cb47394c7e2ff625ebfbef81a88af1e3b
treeed1cef579ca143a566a1652991bf1f2ec9f685c0
parent097d61d104ef35f53fcd613e9e49c6232d34ab7d
parent4b8eb4ffdd3b4a51ee9453bcce6eea6de1c81515
Merge branch 'wip-rgw-quota'

Conflicts:
src/test/cli/radosgw-admin/help.t

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
src/common/config_opts.h
src/rgw/rgw_metadata.cc
src/rgw/rgw_rados.cc
src/test/cli/radosgw-admin/help.t