From: Lenz Grimmer <lgrimmer@suse.com>
Date: Wed, 12 Aug 2020 16:07:20 +0000 (+0200)
Subject: Merge pull request #36562 from s0nea/wip-46895-octopus
X-Git-Tag: v15.2.5~78
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a386f8f48e1287b618728b72b255530e5438e95c;p=ceph.git

Merge pull request #36562 from s0nea/wip-46895-octopus

octopus: mgr/dashboard/api: increase API health timeout

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
---

a386f8f48e1287b618728b72b255530e5438e95c