]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 43d63ee 0fd674b)
Merge pull request #8215 from dzafman/wip-14438
authorSamuel Just <sjust@redhat.com>
Tue, 29 Mar 2016 15:02:41 +0000 (08:02 -0700)
committerSamuel Just <sjust@redhat.com>
Tue, 29 Mar 2016 15:02:41 +0000 (08:02 -0700)
Wip 14438

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.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.