From: Yuri Weinstein <yweinste@redhat.com>
Date: Thu, 29 Oct 2020 20:08:37 +0000 (-0700)
Subject: Merge pull request #37530 from batrick/i47734-octopus
X-Git-Tag: v15.2.8~5^2~1^2~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=79c1ec4d4160950581818ff51631584f259427f2;p=ceph.git

Merge pull request #37530 from batrick/i47734-octopus

octopus: osdc: add timeout configs for mons/osds

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

79c1ec4d4160950581818ff51631584f259427f2