]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
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)
* 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>
1  2 
src/common/legacy_config_opts.h
src/common/options.cc
src/msg/async/ProtocolV1.cc
src/msg/async/ProtocolV2.cc

Simple merge
Simple merge
Simple merge
Simple merge