From: Gregory Farnum <greg@gregs42.com>
Date: Tue, 16 Feb 2016 04:39:55 +0000 (-0800)
Subject: Merge pull request #7629 from ceph/wip-14750-op-timeouts
X-Git-Tag: v10.1.0~372
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fd4d97c027c7019bae5a5e72715ad10cd7edbcfa;p=ceph.git

Merge pull request #7629 from ceph/wip-14750-op-timeouts

Objecter: detect laggy ops with objecter_timeout, not osd_timeout

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
---

fd4d97c027c7019bae5a5e72715ad10cd7edbcfa