]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
rgw: more merge related fixes 3526/head
authorYehuda Sadeh <yehuda@redhat.com>
Fri, 30 Jan 2015 00:24:33 +0000 (16:24 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Fri, 30 Jan 2015 00:24:33 +0000 (16:24 -0800)
commit4c50f6a7fc57fbbe1098e999a86572c4895cc8f0
treecc65c17f6945550aca8088d094e92aa0463fa64d
parent01cc9d54d0ff3977ed7bb570ee12fa4a7909f59c
rgw: more merge related fixes

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
src/rgw/rgw_admin.cc