]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'rgw-sync-cache'
authorYehuda Sadeh <yehuda@hq.newdream.net>
Thu, 14 Jul 2011 19:45:07 +0000 (12:45 -0700)
committerYehuda Sadeh <yehuda@hq.newdream.net>
Thu, 14 Jul 2011 19:45:07 +0000 (12:45 -0700)
commit0cfaee69bad661110fd772bf23322ba5ce905b8b
tree5519371d7bd0cd292c4a292b78e65414dd83dedd
parent8a8c1e815c01cc7403fbfa0b8a352ed45d1ef582
parentba31462a2c4866f8565f2a92ea8916d79de19628
Merge branch 'rgw-sync-cache'

Conflicts:
src/rgw/rgw_op.cc
src/Makefile.am
src/common/config.cc
src/common/config.h
src/rgw/rgw_op.cc
src/rgw/rgw_op.h
src/rgw/rgw_rados.cc