]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #32063 from smithfarm/wip-42878-nautilus
authorYuri Weinstein <yweinste@redhat.com>
Wed, 15 Jan 2020 16:54:46 +0000 (08:54 -0800)
committerGitHub <noreply@github.com>
Wed, 15 Jan 2020 16:54:46 +0000 (08:54 -0800)
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>
1  2 
src/common/admin_socket_client.cc

Simple merge