]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5d2df4 a4a91cc)
Merge pull request #1440 from ceph/wip-7649
authorSamuel Just <sam.just@inktank.com>
Thu, 13 Mar 2014 01:33:03 +0000 (18:33 -0700)
committerSamuel Just <sam.just@inktank.com>
Thu, 13 Mar 2014 01:33:03 +0000 (18:33 -0700)
Wip 7649

Reviewed-by: Sage Weil <sage@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.