]> 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: 91a2492 bcd6aea)
Merge branch 'wip-testrados'
authorSage Weil <sage@inktank.com>
Sun, 21 Oct 2012 16:01:33 +0000 (09:01 -0700)
committerSage Weil <sage@inktank.com>
Sun, 21 Oct 2012 16:01:33 +0000 (09:01 -0700)
Lightly-reviewed-by: Josh Durgin <josh.durgin@inktank.com>
1  2 
src/osdc/Objecter.cc patch | diff1 | diff2 | blob | history
src/osdc/Objecter.h patch | diff1 | diff2 | blob | history

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