aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2019-01-07 14:38:25 +0100
committerErlang/OTP <[email protected]>2019-01-07 14:38:25 +0100
commit86ae3bb161daf1b0e4c370b18285c5b55e97ebe7 (patch)
treed9324cd50c8e6eb9cd4390664547aa652595e25f
parenteacdf022ce5b1e75ca79fc7bb9c23c1917e3391f (diff)
downloadotp-86ae3bb161daf1b0e4c370b18285c5b55e97ebe7.tar.gz
otp-86ae3bb161daf1b0e4c370b18285c5b55e97ebe7.tar.bz2
otp-86ae3bb161daf1b0e4c370b18285c5b55e97ebe7.zip
Prepare release
-rw-r--r--lib/xmerl/doc/src/notes.xml15
-rw-r--r--lib/xmerl/vsn.mk2
-rw-r--r--make/otp_version_tickets3
3 files changed, 17 insertions, 3 deletions
diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index f62a8dc53d..aca98cc8c2 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,6 +32,21 @@
<p>This document describes the changes made to the Xmerl application.</p>
+<section><title>Xmerl 1.3.16.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>The charset detection parsing crash in some cases when
+ the XML directive is not syntactic correct.</p>
+ <p>
+ Own Id: OTP-15492 Aux Id: ERIERL-283 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Xmerl 1.3.16</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk
index ddff0c8894..09c5b181a1 100644
--- a/lib/xmerl/vsn.mk
+++ b/lib/xmerl/vsn.mk
@@ -1 +1 @@
-XMERL_VSN = 1.3.16
+XMERL_VSN = 1.3.16.1
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
index 5148d2743f..d1b9df83a8 100644
--- a/make/otp_version_tickets
+++ b/make/otp_version_tickets
@@ -1,2 +1 @@
-OTP-15397
-OTP-15487
+OTP-15492