]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ef9756 e588298)
Merge branch 'testing' into unstable
authorSage Weil <sage@newdream.net>
Wed, 6 Oct 2010 20:42:04 +0000 (13:42 -0700)
committerSage Weil <sage@newdream.net>
Wed, 6 Oct 2010 20:42:04 +0000 (13:42 -0700)
Conflicts:
src/osd/ReplicatedPG.cc

1  2 
src/rgw/rgw_rest.cc patch | diff1 | diff2 | blob | history

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