]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9266d6 a794c93)
Merge remote-tracking branch 'gh/wip-osd'
authorSage Weil <sage@inktank.com>
Thu, 27 Sep 2012 20:33:45 +0000 (13:33 -0700)
committerSage Weil <sage@inktank.com>
Thu, 27 Sep 2012 20:33:45 +0000 (13:33 -0700)
Reviewed-by: Samuel Just <sam.just@inktank.com>
1  2 
src/osd/PG.cc patch | diff1 | diff2 | blob | history
src/osd/ReplicatedPG.cc patch | diff1 | diff2 | blob | history

diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.