]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #27337 into master
authorSage Weil <sage@redhat.com>
Mon, 8 Apr 2019 14:13:37 +0000 (09:13 -0500)
committerSage Weil <sage@redhat.com>
Mon, 8 Apr 2019 14:13:37 +0000 (09:13 -0500)
commit169576443686550b163faff9c8214b8dacb60e3f
treed15640d8ec6bd2117b116abdcd916af0272ef577
parentfbc71dcf27bcc6f822598e0db22271b72a8e9115
parent7209cc6aa3263d1dfb5cb19d57dd1f6b56aa2804
Merge PR #27337 into master

* refs/pull/27337/head:
msg/async: add timeout for connections which are not yet ready
msg: rename ms_tcp_read_timeout to ms_connection_idle_timeout

Reviewed-by: Ricardo Dias <rdias@suse.com>
src/common/legacy_config_opts.h
src/common/options.cc
src/msg/async/ProtocolV1.cc
src/msg/async/ProtocolV2.cc