]> 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: ec7a140 dedf575)
Merge branch 'wip-kb'
authorSage Weil <sage.weil@dreamhost.com>
Wed, 25 Jan 2012 22:03:18 +0000 (14:03 -0800)
committerSage Weil <sage.weil@dreamhost.com>
Wed, 25 Jan 2012 22:03:18 +0000 (14:03 -0800)
Reviewed-by: Samuel Just <samuel.just@dreamhost.com>
1  2 
src/osd/ReplicatedPG.cc patch | diff1 | diff2 | blob | history

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