aboutsummaryrefslogtreecommitdiffstats
path: root/lib/erl_interface
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2018-06-28 17:09:22 +0200
committerErlang/OTP <[email protected]>2018-06-28 17:09:22 +0200
commitb059b597cb31be08220cb967c117033f34ca49c4 (patch)
treed1b81b6e0de61c6eafa14b012beaeaff4cb4e5d6 /lib/erl_interface
parent9bfe34cd733a3d42e977a6a6d014bd227bec3fb6 (diff)
downloadotp-b059b597cb31be08220cb967c117033f34ca49c4.tar.gz
otp-b059b597cb31be08220cb967c117033f34ca49c4.tar.bz2
otp-b059b597cb31be08220cb967c117033f34ca49c4.zip
Prepare release
Diffstat (limited to 'lib/erl_interface')
-rw-r--r--lib/erl_interface/doc/src/notes.xml18
-rw-r--r--lib/erl_interface/vsn.mk2
2 files changed, 19 insertions, 1 deletions
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml
index f165dde259..4310a142b0 100644
--- a/lib/erl_interface/doc/src/notes.xml
+++ b/lib/erl_interface/doc/src/notes.xml
@@ -31,6 +31,24 @@
</header>
<p>This document describes the changes made to the Erl_interface application.</p>
+<section><title>Erl_Interface 3.10.2.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Make <c>ei_connect</c> and friends also accept state
+ <c>ok_simultaneous</c> during handshake, which means the
+ other node has initiated a connection setup that will be
+ cancelled in favor of this connection.</p>
+ <p>
+ Own Id: OTP-15161 Aux Id: ERIERL-191 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erl_Interface 3.10.2</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk
index 8b6e91757d..4c9cc351c4 100644
--- a/lib/erl_interface/vsn.mk
+++ b/lib/erl_interface/vsn.mk
@@ -1,2 +1,2 @@
-EI_VSN = 3.10.2
+EI_VSN = 3.10.2.1
ERL_INTERFACE_VSN = $(EI_VSN)