]> 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: 740d406 86e4fd4)
Merge pull request #832 from ceph/wip-flush-5855-review
authorDavid Zafman <david.zafman@inktank.com>
Sat, 23 Nov 2013 01:09:54 +0000 (17:09 -0800)
committerDavid Zafman <david.zafman@inktank.com>
Sat, 23 Nov 2013 01:09:54 +0000 (17:09 -0800)
Reviewed-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>
1  2 
src/osd/OSD.cc patch | diff1 | diff2 | blob | history
src/osd/ReplicatedPG.cc patch | diff1 | diff2 | blob | history

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