aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/doc/src
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2018-03-15 11:42:49 +0100
committerErlang/OTP <[email protected]>2018-03-15 11:42:49 +0100
commit56c9cbc73c088e84d2c61be41d9f8056655a5242 (patch)
tree2dbeb9e8a853fdbb1d9e84326427ed46df48350d /lib/ssl/doc/src
parenta113f6117fd696ea6f84ed754055b4ec97a7ccb2 (diff)
parentf8d4d6ca6266b2096ec7e8cc971f7aa5e6d442f8 (diff)
downloadotp-56c9cbc73c088e84d2c61be41d9f8056655a5242.tar.gz
otp-56c9cbc73c088e84d2c61be41d9f8056655a5242.tar.bz2
otp-56c9cbc73c088e84d2c61be41d9f8056655a5242.zip
Merge branch 'ingela/ssl/filter-bug/OTP-14981' into maint-20
* ingela/ssl/filter-bug/OTP-14981: ssl: Prepare for release ssl: Remove duplicate release note ssl: Fix filter function to not discard AEAD cipher suites
Diffstat (limited to 'lib/ssl/doc/src')
-rw-r--r--lib/ssl/doc/src/notes.xml7
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 14ba12167a..810d55e25a 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -64,13 +64,6 @@
</item>
<item>
<p>
- Fix alert handling so that unexpected messages are logged
- and alerted correctly</p>
- <p>
- Own Id: OTP-14929</p>
- </item>
- <item>
- <p>
Correct handling of anonymous cipher suites</p>
<p>
Own Id: OTP-14952</p>