]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #8348 from xiexingguo/xxg-wip-failurepending
authorSage Weil <sage@redhat.com>
Thu, 31 Mar 2016 05:13:58 +0000 (01:13 -0400)
committerSage Weil <sage@redhat.com>
Thu, 31 Mar 2016 05:13:58 +0000 (01:13 -0400)
osd: fix failure report handling during ms_handle_connect()

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/OSD.cc
src/osd/OSD.h
src/osd/PG.cc
src/osd/osd_types.cc

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