]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit24699cce9bba144227dec48665fbf6ace2437497
tree38ed24bdd152a3dc819048311436701fe7306399tree | snapshot
parenta6bbc91c9dcd13fdcd0231ae682e74c3801ee3e3commit | diff
parent0da7da8263bad535da2aa2b110cc54aaa6f1c36ccommit | diff
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>
Unnamed repository; edit this file 'description' to name the repository.