]> 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: 8cb13a1 1507443)
Merge remote-tracking branch 'upstream/bobtail-4556' into bobtail
authorSamuel Just <sam.just@inktank.com>
Fri, 29 Mar 2013 19:14:22 +0000 (12:14 -0700)
committerSamuel Just <sam.just@inktank.com>
Fri, 29 Mar 2013 19:14:25 +0000 (12:14 -0700)
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.