summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnders Svensson <anders@erlang.org>2020-02-28 13:21:06 +0100
committerAnders Svensson <anders@erlang.org>2020-02-28 13:21:06 +0100
commit0b0c9b4b2cdb760a0f12f63fb8bae9ae0d86310d (patch)
tree008cd3f0f17cc5ee2c2c67de630d03074253a29d
parent773b77a8bfe2f2264fc1f49dd594646eec302154 (diff)
parent1af6e2d6313aab7a736008f17fc6577e3ceb9195 (diff)
downloaderlang-0b0c9b4b2cdb760a0f12f63fb8bae9ae0d86310d.tar.gz
Merge branch 'maint-22' into maint
* maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
-rw-r--r--OTP_VERSION2
-rw-r--r--lib/diameter/doc/src/notes.xml51
-rw-r--r--lib/diameter/vsn.mk2
-rw-r--r--make/otp_version_tickets_in_merge3
-rw-r--r--otp_versions.table1
5 files changed, 57 insertions, 2 deletions
diff --git a/OTP_VERSION b/OTP_VERSION
index a5a5c04503..3abee4573a 100644
--- a/OTP_VERSION
+++ b/OTP_VERSION
@@ -1 +1 @@
-22.2.7
+22.2.8
diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml
index 8dcba93273..780b0b894a 100644
--- a/lib/diameter/doc/src/notes.xml
+++ b/lib/diameter/doc/src/notes.xml
@@ -43,6 +43,57 @@ first.</p>
<!-- ===================================================================== -->
+<section><title>diameter 2.2.2</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ The possibility of choosing a handler process for an
+ incoming Diameter request with a configured MFA was
+ documented in OTP 20.0, but counters (with
+ {traffic_counters, true}) were not incremented when this
+ process was on a remote node. Counters are now
+ incremented on the node that configures the transport in
+ question.</p>
+ <p>
+ Introduced in OTP 21.3.</p>
+ <p>
+ Own Id: OTP-16457</p>
+ </item>
+ <item>
+ <p>
+ Transport options differing from those passed to
+ diameter:add_transport/2 were used in several situations:
+ when starting a transport process after connect_timer
+ expiry after an initial connection attempt has failed,
+ when starting a transport process after a connection has
+ been accepted, when sending events, when returning
+ options in diameter:service_info/2, and possibly more. In
+ particular, the following configuration options to
+ diameter:add_transport/2 were dropped: avp_dictionaries,
+ incoming_maxlen, spawn_opt, strict_mbit.</p>
+ <p>
+ Moreover, any service options mistakenly passed to
+ diameter:add_transport/2 were interpreted as such,
+ instead of being ignored as the documentation states,
+ with the consequence that outgoing and incoming requests
+ saw different values of some options, some were always
+ taken from transport options, and others from service
+ options.</p>
+ <p>
+ diameter:add_transport/2 must be called in new code for
+ the fix to have effect.</p>
+ <p>
+ Introduced in OTP 20.1.</p>
+ <p>
+ Own Id: OTP-16459</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>diameter 2.2.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index a8fbca5bc8..e72b6216a7 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -17,5 +17,5 @@
# %CopyrightEnd%
APPLICATION = diameter
-DIAMETER_VSN = 2.2.1
+DIAMETER_VSN = 2.2.2
APP_VSN = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
index e69de29bb2..7039625aa5 100644
--- a/make/otp_version_tickets_in_merge
+++ b/make/otp_version_tickets_in_merge
@@ -0,0 +1,3 @@
+OTP-16457
+OTP-16459
+OTP-16486
diff --git a/otp_versions.table b/otp_versions.table
index 82b8ba27a6..1319fc209f 100644
--- a/otp_versions.table
+++ b/otp_versions.table
@@ -1,3 +1,4 @@
+OTP-22.2.8 : diameter-2.2.2 # asn1-5.0.9 common_test-1.18.1 compiler-7.5.2 crypto-4.6.4 debugger-4.2.8 dialyzer-4.1.1 edoc-0.11 eldap-1.2.8 erl_docgen-0.11 erl_interface-3.13.1 erts-10.6.4 et-1.6.4 eunit-2.4 ftp-1.0.4 hipe-3.19.2 inets-7.1.2 jinterface-1.10.1 kernel-6.5.1 megaco-3.18.7 mnesia-4.16.2 observer-2.9.3 odbc-2.12.4 os_mon-2.5.1 parsetools-2.1.8 public_key-1.7.1 reltool-0.8 runtime_tools-1.14 sasl-3.4.1 snmp-5.4.5 ssh-4.8.2 ssl-9.5.3 stdlib-3.11.2 syntax_tools-2.2.1 tftp-1.0.2 tools-3.3 wx-1.9 xmerl-1.3.23 :
OTP-22.2.7 : compiler-7.5.2 # asn1-5.0.9 common_test-1.18.1 crypto-4.6.4 debugger-4.2.8 dialyzer-4.1.1 diameter-2.2.1 edoc-0.11 eldap-1.2.8 erl_docgen-0.11 erl_interface-3.13.1 erts-10.6.4 et-1.6.4 eunit-2.4 ftp-1.0.4 hipe-3.19.2 inets-7.1.2 jinterface-1.10.1 kernel-6.5.1 megaco-3.18.7 mnesia-4.16.2 observer-2.9.3 odbc-2.12.4 os_mon-2.5.1 parsetools-2.1.8 public_key-1.7.1 reltool-0.8 runtime_tools-1.14 sasl-3.4.1 snmp-5.4.5 ssh-4.8.2 ssl-9.5.3 stdlib-3.11.2 syntax_tools-2.2.1 tftp-1.0.2 tools-3.3 wx-1.9 xmerl-1.3.23 :
OTP-22.2.6 : erts-10.6.4 # asn1-5.0.9 common_test-1.18.1 compiler-7.5.1 crypto-4.6.4 debugger-4.2.8 dialyzer-4.1.1 diameter-2.2.1 edoc-0.11 eldap-1.2.8 erl_docgen-0.11 erl_interface-3.13.1 et-1.6.4 eunit-2.4 ftp-1.0.4 hipe-3.19.2 inets-7.1.2 jinterface-1.10.1 kernel-6.5.1 megaco-3.18.7 mnesia-4.16.2 observer-2.9.3 odbc-2.12.4 os_mon-2.5.1 parsetools-2.1.8 public_key-1.7.1 reltool-0.8 runtime_tools-1.14 sasl-3.4.1 snmp-5.4.5 ssh-4.8.2 ssl-9.5.3 stdlib-3.11.2 syntax_tools-2.2.1 tftp-1.0.2 tools-3.3 wx-1.9 xmerl-1.3.23 :
OTP-22.2.5 : erts-10.6.3 stdlib-3.11.2 # asn1-5.0.9 common_test-1.18.1 compiler-7.5.1 crypto-4.6.4 debugger-4.2.8 dialyzer-4.1.1 diameter-2.2.1 edoc-0.11 eldap-1.2.8 erl_docgen-0.11 erl_interface-3.13.1 et-1.6.4 eunit-2.4 ftp-1.0.4 hipe-3.19.2 inets-7.1.2 jinterface-1.10.1 kernel-6.5.1 megaco-3.18.7 mnesia-4.16.2 observer-2.9.3 odbc-2.12.4 os_mon-2.5.1 parsetools-2.1.8 public_key-1.7.1 reltool-0.8 runtime_tools-1.14 sasl-3.4.1 snmp-5.4.5 ssh-4.8.2 ssl-9.5.3 syntax_tools-2.2.1 tftp-1.0.2 tools-3.3 wx-1.9 xmerl-1.3.23 :