From: Yehuda Sadeh <yehuda@inktank.com>
Date: Wed, 3 Jul 2013 01:13:41 +0000 (-0700)
Subject: Merge branch 'wip-rgw-geo-2' into wip-rgw-geo
X-Git-Tag: v0.67-rc1~128^2~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=24699cce9bba144227dec48665fbf6ace2437497;p=ceph.git

Merge branch 'wip-rgw-geo-2' into wip-rgw-geo

Conflicts:
	src/rgw/rgw_admin.cc
	src/rgw/rgw_common.cc
	src/rgw/rgw_common.h
	src/rgw/rgw_rest.cc
	src/rgw/rgw_rest_log.cc

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
---

24699cce9bba144227dec48665fbf6ace2437497