]> 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: 8f9b147 951fc2f)
Merge branch 'wip_5154'
authorSamuel Just <sam.just@inktank.com>
Thu, 6 Jun 2013 16:21:46 +0000 (09:21 -0700)
committerSamuel Just <sam.just@inktank.com>
Thu, 6 Jun 2013 16:21:46 +0000 (09:21 -0700)
Fixes: #5154
Reviewed-by: Sage Weil <sage@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.