]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #5384 from dachary/wip-12502-hammer
authorLoic Dachary <loic@dachary.org>
Tue, 4 Aug 2015 10:34:18 +0000 (12:34 +0200)
committerLoic Dachary <loic@dachary.org>
Tue, 4 Aug 2015 10:34:18 +0000 (12:34 +0200)
rgw: need conversion tool to handle fixes following #11974

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
1  2 
src/rgw/rgw_admin.cc
src/rgw/rgw_rados.cc

Simple merge
Simple merge