]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ac8aed aa00ace)
Merge remote-tracking branch 'gh/wip-tell-unified' into next
authorSage Weil <sage@inktank.com>
Fri, 26 Jul 2013 23:12:19 +0000 (16:12 -0700)
committerSage Weil <sage@inktank.com>
Fri, 26 Jul 2013 23:12:19 +0000 (16:12 -0700)
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.