summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorIngela Anderton Andin <ingela@erlang.org>2021-03-26 13:15:24 +0100
committerIngela Anderton Andin <ingela@erlang.org>2021-03-26 13:15:24 +0100
commitbe5329863ce9f0d98903bbafca16f3b66b05a332 (patch)
tree74d9ab2ca64e7f821dc739ccdc7bf389be76afe1 /make
parent060773e7bb88897491e6e5d2ba075eb05623882a (diff)
parent2fdabaac8e16fc7d4d49ca1b861fd32f313e87da (diff)
downloaderlang-be5329863ce9f0d98903bbafca16f3b66b05a332.tar.gz
Merge tag 'OTP-23.2.7.1' into maint
=== OTP-23.2.7.1 === Changed Applications: - ssl-10.2.4.1 Unchanged Applications: - asn1-5.0.14 - common_test-1.19.1 - compiler-7.6.6 - crypto-4.8.3 - debugger-5.0 - dialyzer-4.3 - diameter-2.2.3 - edoc-0.12 - eldap-1.2.8 - erl_docgen-1.0.2 - erl_interface-4.0.2 - erts-11.1.8 - et-1.6.4 - eunit-2.6 - ftp-1.0.5 - hipe-4.0.1 - inets-7.3.2 - jinterface-1.11 - kernel-7.2.1 - megaco-3.19.5 - mnesia-4.18.1 - observer-2.9.5 - odbc-2.13.2 - os_mon-2.6.1 - parsetools-2.2 - public_key-1.9.2 - reltool-0.8 - runtime_tools-1.15.1 - sasl-4.0.1 - snmp-5.7.3 - ssh-4.10.8 - stdlib-3.14 - syntax_tools-2.4 - tftp-1.0.2 - tools-3.4.3 - wx-1.9.2 - xmerl-1.3.26 * tag 'OTP-23.2.7.1': Updated OTP version Prepare release # Conflicts: # OTP_VERSION # lib/ssl/doc/src/notes.xml # lib/ssl/vsn.mk # make/otp_version_tickets # otp_versions.table
Diffstat (limited to 'make')
-rw-r--r--make/otp_version_tickets_in_merge4
1 files changed, 0 insertions, 4 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
index f66f16de77..e69de29bb2 100644
--- a/make/otp_version_tickets_in_merge
+++ b/make/otp_version_tickets_in_merge
@@ -1,4 +0,0 @@
-OTP-12960
-OTP-16607
-OTP-17227
-OTP-17228