]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8709612 d9c024b)
Merge branch 'osd-fix' of git://github.com/wonzhq/ceph into hammer
authorSage Weil <sage@redhat.com>
Sat, 21 Feb 2015 18:07:20 +0000 (10:07 -0800)
committerSage Weil <sage@redhat.com>
Sat, 21 Feb 2015 18:07:20 +0000 (10:07 -0800)
commit571f60b88c94c92c8738293f218ca52a48b1f8f0
tree001e15e5d43eb2a225ac7010e553527bb76ccb1dtree | snapshot
parent87096125ac5364f4cb43fa8d8e1eb27c05b11396commit | diff
parentd9c024b8f3138193e38397d120d678a5030d315bcommit | diff
Merge branch 'osd-fix' of git://github.com/wonzhq/ceph into hammer

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
src/osd/OSD.h diff1 | diff2 | blob | history
src/osd/ReplicatedPG.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.