]> 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: 830940b 1f59e40)
Merge pull request #2026 from athanatos/wip-8438-master
authorSamuel Just <sam.just@inktank.com>
Mon, 30 Jun 2014 18:12:03 +0000 (11:12 -0700)
committerSamuel Just <sam.just@inktank.com>
Mon, 30 Jun 2014 18:12:03 +0000 (11:12 -0700)
Wip 8438 master

Fixes: #8438
Backport: Firefly
Reviewed-by: Sage Weil <sage@inktank.com>
1  2 
src/osd/PG.cc patch | diff1 | diff2 | blob | history
src/osd/PG.h patch | diff1 | diff2 | blob | history

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