]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5435a4d 145d1c1)
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@inktank.com>
Tue, 19 Jun 2012 21:29:43 +0000 (14:29 -0700)
committerSage Weil <sage@inktank.com>
Tue, 19 Jun 2012 21:29:43 +0000 (14:29 -0700)
Conflicts:
src/osd/PG.cc

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.