From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 27 Nov 2018 21:58:26 +0000 (-0800)
Subject: Merge PR #24886 into master
X-Git-Tag: v14.1.0~791
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b76f14569d6d27e848e8377964a5b65e4436afb9;p=ceph.git

Merge PR #24886 into master

* refs/pull/24886/head:
	qa: fix delay type config name

Reviewed-by: Zheng Yan <zyan@redhat.com>
---

b76f14569d6d27e848e8377964a5b65e4436afb9