diff options
| author | Anders Svensson <[email protected]> | 2013-03-19 13:36:17 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2013-03-19 13:36:17 +0100 |
| commit | 0be34905e603ca9e1acb5ea763bf25cdab8d5d7c (patch) | |
| tree | 31848107e9ae046fdf03ddaf66c331941cb61b91 /lib/ssh/src | |
| parent | 3f9a86fb6b9598a7172150e3a272d40498c8e3b4 (diff) | |
| parent | f285ee66678ae8761dc82b5ba0c023dd759091fc (diff) | |
| download | otp-0be34905e603ca9e1acb5ea763bf25cdab8d5d7c.tar.gz otp-0be34905e603ca9e1acb5ea763bf25cdab8d5d7c.tar.bz2 otp-0be34905e603ca9e1acb5ea763bf25cdab8d5d7c.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssh/src')
| -rw-r--r-- | lib/ssh/src/ssh_connection_manager.erl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_connection_manager.erl b/lib/ssh/src/ssh_connection_manager.erl index 79a11c4b20..99a0b6a7c8 100644 --- a/lib/ssh/src/ssh_connection_manager.erl +++ b/lib/ssh/src/ssh_connection_manager.erl @@ -560,7 +560,6 @@ handle_info({start_connection, server, Exec = proplists:get_value(exec, Options), CliSpec = proplists:get_value(ssh_cli, Options, {ssh_cli, [Shell]}), ssh_connection_handler:send_event(Connection, socket_control), - erlang:send_after(3600000, self(), rekey), erlang:send_after(60000, self(), rekey_data), {noreply, State#state{connection = Connection, connection_state = |