From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 15 Jan 2020 16:54:46 +0000 (-0800)
Subject: Merge pull request #32063 from smithfarm/wip-42878-nautilus
X-Git-Tag: v14.2.8~20^2~39
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a17426504bb8e2d3d97eaa8346de17f97b98debf;p=ceph.git

Merge pull request #32063 from smithfarm/wip-42878-nautilus

nautilus: common/admin_socket: Increase socket timeouts

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

a17426504bb8e2d3d97eaa8346de17f97b98debf