summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorHenrik Nord <henrik@erlang.org>2020-12-16 08:23:35 +0100
committerHenrik Nord <henrik@erlang.org>2020-12-16 08:23:35 +0100
commit6c7b644ed4a0cd0940643c5810b1ba98bad21b73 (patch)
treeb8cfa6555e8710cd43b0c59d80e0dcb4bc173566 /make
parent54ce4aefca2792bead5ef79fe77c2a12f7898ca2 (diff)
parent5a3d03ee2c12f4c93cf7375abdb3c04f7423f76d (diff)
downloaderlang-6c7b644ed4a0cd0940643c5810b1ba98bad21b73.tar.gz
Merge branch 'maint'
* maint: Updated OTP version Prepare release # Conflicts: # OTP_VERSION
Diffstat (limited to 'make')
-rw-r--r--make/otp_version_tickets_in_merge69
1 files changed, 69 insertions, 0 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
index e69de29bb2..b6fc5c1aca 100644
--- a/make/otp_version_tickets_in_merge
+++ b/make/otp_version_tickets_in_merge
@@ -0,0 +1,69 @@
+OTP-15126
+OTP-16267
+OTP-16277
+OTP-16445
+OTP-16460
+OTP-16529
+OTP-16607
+OTP-16649
+OTP-16762
+OTP-16799
+OTP-16819
+OTP-16849
+OTP-16859
+OTP-16863
+OTP-16864
+OTP-16869
+OTP-16873
+OTP-16888
+OTP-16889
+OTP-16893
+OTP-16894
+OTP-16899
+OTP-16900
+OTP-16908
+OTP-16920
+OTP-16921
+OTP-16922
+OTP-16923
+OTP-16931
+OTP-16932
+OTP-16941
+OTP-16948
+OTP-16954
+OTP-16956
+OTP-16976
+OTP-16983
+OTP-16989
+OTP-16990
+OTP-16993
+OTP-17008
+OTP-17012
+OTP-17013
+OTP-17018
+OTP-17019
+OTP-17022
+OTP-17025
+OTP-17027
+OTP-17029
+OTP-17030
+OTP-17033
+OTP-17034
+OTP-17038
+OTP-17039
+OTP-17045
+OTP-17046
+OTP-17047
+OTP-17054
+OTP-17055
+OTP-17056
+OTP-17058
+OTP-17060
+OTP-17061
+OTP-17065
+OTP-17066
+OTP-17067
+OTP-17068
+OTP-17069
+OTP-17070
+OTP-17072