]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge commit 'origin/master' into rgw
authorYehuda Sadeh <yehuda@hq.newdream.net>
Wed, 16 Mar 2011 17:45:43 +0000 (10:45 -0700)
committerYehuda Sadeh <yehuda@hq.newdream.net>
Wed, 16 Mar 2011 17:45:43 +0000 (10:45 -0700)
commit8f2392b88fd08619cfdad1e7d2a26aa1ecb643ed
tree25c66321b62d942ca79b3b911980ac6b2e7f19e0
parent5d7a12cf83f5dcb70b5aa4aeb7a26c6a24276101
parent2319ae13aaeb03e91520d1a0c167c8383f001957
Merge commit 'origin/master' into rgw

Conflicts:

src/Makefile.am
src/rados.cc
src/rgw/rgw_admin.cc
src/rgw/rgw_main.cc
src/rgw/rgw_rest.cc
19 files changed:
configure.ac
debian/control
src/Makefile.am
src/common/ceph_crypto.h
src/rados.cc
src/rgw/rgw_access.cc
src/rgw/rgw_access.h
src/rgw/rgw_admin.cc
src/rgw/rgw_cache.h
src/rgw/rgw_common.h
src/rgw/rgw_fs.cc
src/rgw/rgw_fs.h
src/rgw/rgw_main.cc
src/rgw/rgw_op.cc
src/rgw/rgw_op.h
src/rgw/rgw_rados.cc
src/rgw/rgw_rados.h
src/rgw/rgw_rest.cc
src/rgw/rgw_rest.h