]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-rgw-geo-2' into wip-rgw-geo
authorYehuda Sadeh <yehuda@inktank.com>
Fri, 21 Jun 2013 17:53:48 +0000 (10:53 -0700)
committerYehuda Sadeh <yehuda@inktank.com>
Fri, 21 Jun 2013 17:53:48 +0000 (10:53 -0700)
commit409422be6de3b2b3c134e6308e2d2eb4a832a35e
treebcec184b9b812c3830de276d960288bb22eb5794
parent7b5ec743f03a16bd9a901b754fcb64598e7d6b17
parent24e59b4377ed03d18e935c5877ffcd2b6be32f27
Merge branch 'wip-rgw-geo-2' into wip-rgw-geo

Conflicts:
src/test/cli/radosgw-admin/help.t
src/Makefile.am
src/rgw/rgw_rados.cc