]> 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: 195884e 293affe)
Merge pull request #4696 from ceph/wip-11622-hammer
authorLoic Dachary <loic@dachary.org>
Mon, 18 May 2015 12:26:16 +0000 (14:26 +0200)
committerLoic Dachary <loic@dachary.org>
Mon, 18 May 2015 12:26:16 +0000 (14:26 +0200)
Wip 11622 hammer

Reviewed-by: Loic Dachary <ldachary@redhat.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.