]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'origin/master' into rgw-multipart
authorYehuda Sadeh <yehuda@hq.newdream.net>
Thu, 16 Jun 2011 21:19:47 +0000 (14:19 -0700)
committerYehuda Sadeh <yehuda@hq.newdream.net>
Thu, 16 Jun 2011 21:19:47 +0000 (14:19 -0700)
commitabfa872f64cc02afbbe9a2d51660594389623d86
tree4e2ef312099dc0a5171e1d300b71cf9d6a53ca53
parent8b4b83842cdf2e707efd6c3aded9abbf1ab352d7
parent062ddf25a29dc0fc3e35b4fbe86f32bcc4a509c4
Merge remote-tracking branch 'origin/master' into rgw-multipart

Conflicts:
src/os/FileStore.cc
src/rgw/rgw_admin.cc
src/rgw/rgw_fs.h
src/rgw/rgw_log.cc
src/rgw/rgw_rados.cc
src/rgw/rgw_user.cc
src/rgw/rgw_user.h
26 files changed:
src/.gitignore
src/Makefile.am
src/include/rados/librados.h
src/include/rados/librados.hpp
src/librados.cc
src/os/FileStore.cc
src/osd/OSD.cc
src/osd/ReplicatedPG.cc
src/osdc/Objecter.h
src/rgw/librgw.cc
src/rgw/rgw_access.h
src/rgw/rgw_acl.h
src/rgw/rgw_admin.cc
src/rgw/rgw_common.cc
src/rgw/rgw_common.h
src/rgw/rgw_fs.cc
src/rgw/rgw_fs.h
src/rgw/rgw_log.cc
src/rgw/rgw_op.cc
src/rgw/rgw_rados.cc
src/rgw/rgw_rados.h
src/rgw/rgw_rest.cc
src/rgw/rgw_rest.h
src/rgw/rgw_rest_s3.cc
src/rgw/rgw_user.cc
src/rgw/rgw_user.h