From c35a6917cd61162c6366448d77e96dbe4e515996 Mon Sep 17 00:00:00 2001
From: Fredrik Gustafsson <fredrik@erlang.org>
Date: Thu, 14 Mar 2013 16:03:46 +0100
Subject: Removed timing rekeying

---
 lib/ssh/src/ssh_connection_manager.erl | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lib/ssh')

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 = 
-- 
cgit v1.2.3


From 77c9f844f137deec2d49bd6c28ec03bce97d34df Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Mon, 18 Mar 2013 14:21:06 +0100
Subject: Prepare release

---
 lib/ssh/doc/src/notes.xml | 15 +++++++++++++++
 lib/ssh/vsn.mk            |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'lib/ssh')

diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index dead764700..f65b66a7c5 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -29,6 +29,21 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 2.1.6</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed timing rekeying bug.</p>
+          <p>
+	    Own Id: OTP-10940</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 2.1.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 8f6aac1f5d..d5ca1cb3fe 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,5 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 2.1.5
+SSH_VSN = 2.1.6
 APP_VSN    = "ssh-$(SSH_VSN)"
 
-- 
cgit v1.2.3