From: Sage Weil <sage@redhat.com>
Date: Wed, 19 Sep 2018 14:40:24 +0000 (-0500)
Subject: Merge PR #24145 into master
X-Git-Tag: v14.0.1~247
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b567d183d53f096d25830e28c3190f9c9d5c783f;p=ceph.git

Merge PR #24145 into master

* refs/pull/24145/head:
	qa/workunits/mon/caps.sh: wait longer to time out

Reviewed-by: João Eduardo Luís <joao@suse.de>
---

b567d183d53f096d25830e28c3190f9c9d5c783f