From: Sage Weil Date: Thu, 5 Feb 2015 09:12:51 +0000 (-0800) Subject: Merge pull request #3622 from athanatos/wip-10340 X-Git-Tag: v0.93~95^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7dc9adeec3ae66b91a77c7cdfabbe0aeaf93ec34;p=ceph.git Merge pull request #3622 from athanatos/wip-10340 Objecter::_op_submit_with_budget: add timeout before call Reviewed-by: Sage Weil --- 7dc9adeec3ae66b91a77c7cdfabbe0aeaf93ec34