diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-12-06 15:02:30 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-12-06 15:02:30 +0100 |
| commit | 214d1aaf4749ae6a7bb0506cf448551a312a9a58 (patch) | |
| tree | 380065f3e00e8cd3de49f155a9db41ceb6c6a68b /lib/ssl/doc/src/notes.xml | |
| parent | af68f5a22f995284b07ece178c42e630ecf94d54 (diff) | |
| parent | 2eb32af0fdd74bb4d61f952fbd96e548bb916eb1 (diff) | |
| download | otp-214d1aaf4749ae6a7bb0506cf448551a312a9a58.tar.gz otp-214d1aaf4749ae6a7bb0506cf448551a312a9a58.tar.bz2 otp-214d1aaf4749ae6a7bb0506cf448551a312a9a58.zip | |
Merge tag 'erl_1218' into maint
ssl: Patch 1218
OTP-10600 ssl:ssl_accept/2 timeout is no longer ignored
Diffstat (limited to 'lib/ssl/doc/src/notes.xml')
| -rw-r--r-- | lib/ssl/doc/src/notes.xml | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml index 7e751a215d..49bbd5d27d 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.1.1</title> + <section><title>SSL 5.1.2</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + ssl:ssl_accept/2 timeout is no longer ignored</p> + <p> + Own Id: OTP-10600</p> + </item> + </list> + </section> + +</section> + +<section><title>SSL 5.1.1</title> <section><title>Fixed Bugs and Malfunctions</title> <list> |