aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-08-22 09:50:48 +0200
committerMarcus Arendt <[email protected]>2014-08-22 09:50:48 +0200
commitb104e409c3df5da4df12a29db3af32e24ea5f6e1 (patch)
tree1d396b9555ed281259858671219f153cc041524a /lib
parentae9c3f7b755d5ebf4e65146d81d04c2d48b4d9c9 (diff)
parent3d74589f0519da8c81f1cb4bff6c01a0011a1063 (diff)
downloadotp-b104e409c3df5da4df12a29db3af32e24ea5f6e1.tar.gz
otp-b104e409c3df5da4df12a29db3af32e24ea5f6e1.tar.bz2
otp-b104e409c3df5da4df12a29db3af32e24ea5f6e1.zip
Merge branch 'maint'
* maint: Updated OTP version Update release notes Conflicts: OTP_VERSION
Diffstat (limited to 'lib')
-rw-r--r--lib/ssh/doc/src/notes.xml21
1 files changed, 21 insertions, 0 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 0dbec7527a..60440d3a80 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -29,6 +29,27 @@
<file>notes.xml</file>
</header>
+<section><title>Ssh 3.0.4</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ When starting an ssh-daemon giving the option
+ {parallel_login, true}, the timeout for authentication
+ negotiation ({negotiation_timeout, integer()}) was never
+ removed.</p>
+ <p>
+ This caused the session to always be terminated after the
+ timeout if parallel_login was set.</p>
+ <p>
+ Own Id: OTP-12057 Aux Id: seq12663 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Ssh 3.0.3</title>
<section><title>Fixed Bugs and Malfunctions</title>