]> 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: fe3fd5f 98ed9ac)
Merge pull request #1045 from ceph/wip-7093
authorSage Weil <sage@inktank.com>
Thu, 9 Jan 2014 01:05:46 +0000 (17:05 -0800)
committerSage Weil <sage@inktank.com>
Thu, 9 Jan 2014 01:05:46 +0000 (17:05 -0800)
fix for #7093

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

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