]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'origin/wip-rgw-geo-2' into wip-rgw-geo
authorYehuda Sadeh <yehuda@inktank.com>
Wed, 3 Jul 2013 01:59:22 +0000 (18:59 -0700)
committerYehuda Sadeh <yehuda@inktank.com>
Wed, 3 Jul 2013 01:59:22 +0000 (18:59 -0700)

Trivial merge