]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 68863bb 216fd77)
Merge remote branch 'origin/stable' into next
authorSage Weil <sage.weil@dreamhost.com>
Mon, 18 Apr 2011 23:23:03 +0000 (16:23 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Mon, 18 Apr 2011 23:23:03 +0000 (16:23 -0700)
1  2 
src/osdc/Objecter.cc patch | diff1 | diff2 | blob | history

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