]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #7629 from ceph/wip-14750-op-timeouts
authorGregory Farnum <greg@gregs42.com>
Tue, 16 Feb 2016 04:39:55 +0000 (20:39 -0800)
committerGregory Farnum <greg@gregs42.com>
Tue, 16 Feb 2016 04:39:55 +0000 (20:39 -0800)
Objecter: detect laggy ops with objecter_timeout, not osd_timeout

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

Trivial merge