]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d6dc42 0deb6d4)
Merge branch 'wip-rgw-geo-enovance' into wip-rgw-geo-2
authorYehuda Sadeh <yehuda@inktank.com>
Thu, 20 Jun 2013 21:42:17 +0000 (14:42 -0700)
committerYehuda Sadeh <yehuda@inktank.com>
Thu, 20 Jun 2013 21:42:17 +0000 (14:42 -0700)
1  2 
src/rgw/rgw_admin.cc patch | diff1 | diff2 | blob | history
src/rgw/rgw_rados.h patch | diff1 | diff2 | blob | history

diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/rgw/rgw_rados.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.