]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'master' of ssh://github.com/NewDreamNetwork/ceph
authorYehuda Sadeh <yehuda@hq.newdream.net>
Tue, 25 Oct 2011 23:29:40 +0000 (16:29 -0700)
committerYehuda Sadeh <yehuda@hq.newdream.net>
Tue, 25 Oct 2011 23:29:40 +0000 (16:29 -0700)
commit71fd83022067ac14b12602cc2e7f78d92773f3cb
tree44f49f70bc4ff8d3b8f0ef0471f3927318ffbb24
parentd9f73605b9095e6813004269bed72219d5be76d5
parent952be11aaa9ce62df713838c4366f480da70b25b
Merge branch 'master' of ssh://github.com/NewDreamNetwork/ceph

Conflicts:
src/rgw/rgw_rados.cc
src/rgw/rgw_cls_api.h
src/rgw/rgw_common.h
src/rgw/rgw_fs.cc
src/rgw/rgw_main.cc
src/rgw/rgw_rados.cc
src/rgw/rgw_rados.h