]> 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: 393a202 1975441)
Merge pull request #1214 from ceph/wip-rgw-manifest-2
authorJosh Durgin <josh.durgin@inktank.com>
Tue, 18 Feb 2014 21:07:53 +0000 (13:07 -0800)
committerJosh Durgin <josh.durgin@inktank.com>
Tue, 18 Feb 2014 21:07:53 +0000 (13:07 -0800)
Wip rgw manifest 2
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
1  2 
src/rgw/rgw_op.cc patch | diff1 | diff2 | blob | history
src/test/Makefile.am patch | diff1 | diff2 | blob | history

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