From: Gregory Farnum <greg@gregs42.com>
Date: Fri, 28 Aug 2015 13:01:08 +0000 (+0100)
Subject: Merge pull request #547 from ceph/wip-12822
X-Git-Tag: v10.2.6~165^2^2~397^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1c250b534d40c5290c1b2a2d9222a91f9f58bb17;p=ceph.git

Merge pull request #547 from ceph/wip-12822

tasks/cephfs: timeout on wait in test_network_death

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
---

1c250b534d40c5290c1b2a2d9222a91f9f58bb17