]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #16702 from hjwsm1989/wip-recover-timeout-expired
authorYuri Weinstein <yuri.weinstein@gmail.com>
Thu, 10 Aug 2017 14:43:30 +0000 (07:43 -0700)
committerGitHub <noreply@github.com>
Thu, 10 Aug 2017 14:43:30 +0000 (07:43 -0700)
 osd: do not forget pg_stat acks which failed to send

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
1  2 
src/osd/OSD.cc

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