From: Sage Weil <sage@inktank.com>
Date: Fri, 17 Jan 2014 19:59:00 +0000 (-0800)
Subject: Merge pull request #1082 from dachary/wip-ceph-disk
X-Git-Tag: v0.78~303
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7f61d2492fe5228c6b8624f868c9e8f6a0a3bedb;p=ceph.git

Merge pull request #1082 from dachary/wip-ceph-disk

ceph-disk: larger timeout in the test script

Reviewed-by: Sage Weil <sage@inktank.com>
---

7f61d2492fe5228c6b8624f868c9e8f6a0a3bedb