]> 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: f7c093e d9fac9c)
Merge pull request #1949 from ceph/wip-7774-3
authorJosh Durgin <josh.durgin@inktank.com>
Sat, 14 Jun 2014 01:24:19 +0000 (18:24 -0700)
committerJosh Durgin <josh.durgin@inktank.com>
Sat, 14 Jun 2014 01:24:19 +0000 (18:24 -0700)
Wip 7774 3

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
1  2 
src/rgw/rgw_op.cc patch | diff1 | diff2 | blob | history
src/rgw/rgw_rados.cc patch | diff1 | diff2 | blob | history

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