]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70a3cad cbc9d42)
Merge pull request #8190 from yehudasa/wip-rgw-sync-fixes-4
authorYehuda Sadeh <yehuda@redhat.com>
Wed, 23 Mar 2016 22:23:16 +0000 (15:23 -0700)
committerYehuda Sadeh <yehuda@redhat.com>
Wed, 23 Mar 2016 22:23:16 +0000 (15:23 -0700)
Wip rgw sync fixes 4

Reviewed-by: Casey Bodley <cbodley@redhat.com>
1  2 
src/rgw/rgw_admin.cc patch | diff1 | diff2 | blob | history
src/rgw/rgw_rados.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.cc
Simple merge
diff --cc src/rgw/rgw_rados.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.