]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'origin/master' into wip-decouple-bucket
authorYehuda Sadeh <yehuda@hq.newdream.net>
Wed, 24 Aug 2011 01:52:08 +0000 (18:52 -0700)
committerYehuda Sadeh <yehuda@hq.newdream.net>
Wed, 24 Aug 2011 01:52:08 +0000 (18:52 -0700)
commit190b89364c81eda645a129976ca80e0db146ddd9
treeacc943b6c319b9f1722d80df0a79b2535451dd9e
parentadf1efe9a94efa9aed2ebda9bbe6e956769d39c6
parent1a7eac4d82ec34e04af30f3858fec5231408576e
Merge remote-tracking branch 'origin/master' into wip-decouple-bucket

Conflicts:
src/rgw/rgw_rados.cc
src/Makefile.am
src/rados_sync.h
src/rgw/rgw_access.h
src/rgw/rgw_cache.h
src/rgw/rgw_common.h
src/rgw/rgw_op.cc
src/rgw/rgw_rados.cc
src/rgw/rgw_rados.h