]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4509674 20f99ca)
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@redhat.com>
Thu, 13 Nov 2014 21:26:04 +0000 (13:26 -0800)
committerSage Weil <sage@redhat.com>
Thu, 13 Nov 2014 21:26:04 +0000 (13:26 -0800)
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.