From: Josh Durgin <jdurgin@redhat.com>
Date: Mon, 23 Feb 2015 22:51:49 +0000 (-0800)
Subject: Merge pull request #3779 from liewegas/wip-watch-timeout-test
X-Git-Tag: v0.93~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=11f8cd81dacdb6506b1059302e07cde9ee8eb910;p=ceph.git

Merge pull request #3779 from liewegas/wip-watch-timeout-test

make watch timeout test less likely to fail under thrashing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

11f8cd81dacdb6506b1059302e07cde9ee8eb910