From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 17 Oct 2018 17:17:29 +0000 (-0700)
Subject: Merge PR #24455 into master
X-Git-Tag: v14.1.0~1165
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6345c3f80d990b3d0c9ae7515219d168ca2468b5;p=ceph.git

Merge PR #24455 into master

* refs/pull/24455/head:
	qa: use timeout for fs asok operations

Reviewed-by: Jeff Layton <jlayton@redhat.com>
---

6345c3f80d990b3d0c9ae7515219d168ca2468b5