aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-11-04 15:47:37 +0100
committerIngela Anderton Andin <[email protected]>2014-11-04 15:47:37 +0100
commit7ed6eb5554bdf84da4549c9e6d38f85d8b397d33 (patch)
treed8e5b71c3be612aee2e9a561986d5d1c1cd6c330 /lib
parent0656f42b810771ef319fe4a52745cec9e3aea652 (diff)
parent509163307c31bf4f98a638b47ee03a5b99eb2c73 (diff)
downloadotp-7ed6eb5554bdf84da4549c9e6d38f85d8b397d33.tar.gz
otp-7ed6eb5554bdf84da4549c9e6d38f85d8b397d33.tar.bz2
otp-7ed6eb5554bdf84da4549c9e6d38f85d8b397d33.zip
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r--lib/ssh/src/ssh_connection_handler.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index fa107be1b1..8b7c4a5f80 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -624,7 +624,7 @@ handle_event(renegotiate, connected, #state{ssh_params = Ssh0}
renegotiate = true})};
handle_event(renegotiate, StateName, State) ->
- timer:apply_after(?REKEY_TIMOUT, gen_fsm, send_all_state_event, [self(), renegotiatie]),
+ timer:apply_after(?REKEY_TIMOUT, gen_fsm, send_all_state_event, [self(), renegotiate]),
%% Allready in keyexcahange so ignore
{next_state, StateName, State};