]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'rgw' of ssh://ceph.newdream.net/git/ceph into rgw
authorYehuda Sadeh <yehuda@hq.newdream.net>
Tue, 22 Mar 2011 23:41:05 +0000 (16:41 -0700)
committerYehuda Sadeh <yehuda@hq.newdream.net>
Tue, 22 Mar 2011 23:41:05 +0000 (16:41 -0700)
commita29742cd1f97f83509a98720a86637cc7ca3cdd0
treeb1672a33152ad3df2515c5027c51bf3f77a7fc78
parentf509c86333b2eb5af69ee3e2eb1b94287e77683a
parent5f14fd96fed2a7d1072c28ede66988e7ba3b67ea
Merge branch 'rgw' of ssh://ceph.newdream.net/git/ceph into rgw
src/rgw/rgw_admin.cc
src/rgw/rgw_user.cc