]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #37530 from batrick/i47734-octopus
authorYuri Weinstein <yweinste@redhat.com>
Thu, 29 Oct 2020 20:08:37 +0000 (13:08 -0700)
committerGitHub <noreply@github.com>
Thu, 29 Oct 2020 20:08:37 +0000 (13:08 -0700)
octopus: osdc: add timeout configs for mons/osds

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

Trivial merge