aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2015-07-01 15:54:27 +0200
committerErlang/OTP <[email protected]>2015-07-01 15:54:27 +0200
commit899f9602d44a7e6e9b7f7be389d905f5663c51bd (patch)
treeec855371b80ed3c5d450c4ce1525a39707ec2df1
parent73da9471177f9b5b67f063cd88f029f687864c50 (diff)
downloadotp-maint-r15.tar.gz
otp-maint-r15.tar.bz2
otp-maint-r15.zip
Prepare releasemaint-r15
-rw-r--r--lib/inets/doc/src/notes.xml20
-rw-r--r--lib/ssh/doc/src/notes.xml15
-rw-r--r--lib/ssh/vsn.mk2
-rw-r--r--lib/ssl/doc/src/notes.xml17
4 files changed, 51 insertions, 3 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index cff2ca427d..7f75f960af 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -32,7 +32,25 @@
<file>notes.xml</file>
</header>
- <section><title>Inets 5.9.8</title>
+ <section><title>Inets 5.9.8.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ If a wrapper script is used to open a privileged port
+ before starting erlang and supplied as a init argument to
+ erlang it should override the port configured by the
+ httpd config file. This feature was broken.</p>
+ <p>
+ Own Id: OTP-12874 Aux Id: seq12878 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Inets 5.9.8</title>
<section><title>Improvements and New Features</title>
<list>
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 6e7d76c137..a952e28d05 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.0.9.1</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Backport of ssh-3.0 to solve process leak (OTP-11363)</p>
+ <p>
+ Own Id: OTP-12884</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Ssh 2.1.2.1</title>
<section><title>Improvements and New Features</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index c5584712dc..223a081eee 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.2.1.1
+SSH_VSN = 2.0.9.1
APP_VSN = "ssh-$(SSH_VSN)"
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 5086ab7da5..7ac41390cd 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -30,7 +30,22 @@
</header>
<p>This document describes the changes made to the SSL application.</p>
- <section><title>SSL 5.2.1.3</title>
+ <section><title>SSL 5.2.1.4</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fix broken appup</p>
+ <p>
+ Own Id: OTP-12878</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>SSL 5.2.1.3</title>
<section><title>Improvements and New Features</title>
<list>