aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2019-06-18 09:42:33 +0200
committerJohn Högberg <[email protected]>2019-06-18 09:42:33 +0200
commit39f0bd930bd028c5520da0430056994e4c5925c3 (patch)
tree763eb7333139bba0524d1a50607230a0efe0ba2f /lib/public_key
parentc5ab02e56946b5edd0c9b2705214aa6f4fd6d6ba (diff)
parent348e328375fb774b3fa919ffd1c4811367406516 (diff)
downloadotp-39f0bd930bd028c5520da0430056994e4c5925c3.tar.gz
otp-39f0bd930bd028c5520da0430056994e4c5925c3.tar.bz2
otp-39f0bd930bd028c5520da0430056994e4c5925c3.zip
Merge branch 'maint-21' into maint
* maint-21: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # lib/common_test/doc/src/notes.xml # lib/common_test/vsn.mk # lib/kernel/doc/src/notes.xml # lib/kernel/vsn.mk # lib/public_key/doc/src/notes.xml # lib/public_key/vsn.mk # lib/ssl/doc/src/notes.xml # lib/ssl/vsn.mk # lib/stdlib/doc/src/notes.xml # lib/stdlib/vsn.mk # make/otp_version_tickets # otp_versions.table
Diffstat (limited to 'lib/public_key')
-rw-r--r--lib/public_key/doc/src/notes.xml16
1 files changed, 15 insertions, 1 deletions
diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index d13c9a520a..57d9898661 100644
--- a/lib/public_key/doc/src/notes.xml
+++ b/lib/public_key/doc/src/notes.xml
@@ -87,6 +87,21 @@
</section>
+<section><title>Public_Key 1.6.6.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Support Pasword based encryption with AES</p>
+ <p>
+ Own Id: OTP-15870 Aux Id: ERL-952 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Public_Key 1.6.6</title>
<section><title>Improvements and New Features</title>
@@ -1247,4 +1262,3 @@
</chapter>
-