]> 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: be76114 732f3ec)
Merge branch 'stable'
authorSage Weil <sage@newdream.net>
Fri, 24 Feb 2012 21:22:49 +0000 (13:22 -0800)
committerSage Weil <sage@newdream.net>
Fri, 24 Feb 2012 21:22:49 +0000 (13:22 -0800)
1  2 
src/osd/osd_types.cc patch | diff1 | diff2 | blob | history

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