From: Sage Weil <sage@redhat.com>
Date: Wed, 27 Mar 2019 14:43:21 +0000 (-0500)
Subject: Merge PR #27187 into master
X-Git-Tag: v15.0.0~67
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=64addc597a2fbdecdce8eccf44ad915df5250dbf;p=ceph.git

Merge PR #27187 into master

* refs/pull/27187/head:
	mgr/dashboard/qa: Increase timeout for test_disable (tasks.mgr.dashboard.test_mgr_module.MgrModuleTelemetryTest)

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
---

64addc597a2fbdecdce8eccf44ad915df5250dbf