From: Yuri Weinstein <yuri.weinstein@gmail.com>
Date: Thu, 10 Aug 2017 14:43:30 +0000 (-0700)
Subject: Merge pull request #16702 from hjwsm1989/wip-recover-timeout-expired
X-Git-Tag: v13.0.0~154
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=61e0999ee69ad98c2b3a7e0dabfee0dd2256dd1c;p=ceph.git

Merge pull request #16702 from hjwsm1989/wip-recover-timeout-expired

 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>
---

61e0999ee69ad98c2b3a7e0dabfee0dd2256dd1c