]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
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)
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
1  2 
src/osd/OSD.h
src/osd/ReplicatedPG.cc

diff --cc src/osd/OSD.h
Simple merge
Simple merge