]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a6bbc91 0da7da8)
Merge branch 'wip-rgw-geo-2' into wip-rgw-geo
authorYehuda Sadeh <yehuda@inktank.com>
Wed, 3 Jul 2013 01:13:41 +0000 (18:13 -0700)
committerYehuda Sadeh <yehuda@inktank.com>
Wed, 3 Jul 2013 01:13:41 +0000 (18:13 -0700)
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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.