]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9034370 c0d92b6)
Merge pull request #931 from ceph/wip-5858-rebase
authorathanatos <sam.just@inktank.com>
Mon, 13 Jan 2014 22:25:51 +0000 (14:25 -0800)
committerathanatos <sam.just@inktank.com>
Mon, 13 Jan 2014 22:25:51 +0000 (14:25 -0800)
Wip 5858 rebase

Reviewed-by: Samuel Just <sam.just@inktank.com>
1  2 
src/osd/OSD.cc patch | diff1 | diff2 | blob | history
src/osd/ReplicatedPG.cc patch | diff1 | diff2 | blob | history
src/osd/ReplicatedPG.h patch | diff1 | diff2 | blob | history

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