diff options
| author | Rickard Green <rickard@erlang.org> | 2020-03-16 13:57:48 +0100 |
|---|---|---|
| committer | Rickard Green <rickard@erlang.org> | 2020-03-16 13:57:48 +0100 |
| commit | 13dadd482b24046c080e4b8a6e4bc804efcff415 (patch) | |
| tree | 824e3326973753b64e38a27709db2ea1b03fefc0 /make | |
| parent | 84f4f25e1f07c221cadd62a4d2bb5dd9a5911922 (diff) | |
| parent | 5b526169ea616e87a7145d2a996b94a91879f200 (diff) | |
| download | erlang-13dadd482b24046c080e4b8a6e4bc804efcff415.tar.gz | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
# erts/doc/src/socket.xml
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp_version_tickets_in_merge | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index e69de29bb2..a28ea26678 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -0,0 +1,62 @@ +OTP-14644 +OTP-15856 +OTP-16039 +OTP-16046 +OTP-16059 +OTP-16153 +OTP-16158 +OTP-16212 +OTP-16253 +OTP-16258 +OTP-16306 +OTP-16309 +OTP-16321 +OTP-16322 +OTP-16340 +OTP-16348 +OTP-16350 +OTP-16351 +OTP-16352 +OTP-16353 +OTP-16356 +OTP-16364 +OTP-16377 +OTP-16380 +OTP-16381 +OTP-16384 +OTP-16387 +OTP-16399 +OTP-16404 +OTP-16412 +OTP-16414 +OTP-16417 +OTP-16418 +OTP-16420 +OTP-16425 +OTP-16427 +OTP-16428 +OTP-16435 +OTP-16437 +OTP-16438 +OTP-16439 +OTP-16440 +OTP-16447 +OTP-16449 +OTP-16450 +OTP-16458 +OTP-16468 +OTP-16472 +OTP-16475 +OTP-16476 +OTP-16477 +OTP-16479 +OTP-16481 +OTP-16485 +OTP-16491 +OTP-16493 +OTP-16498 +OTP-16514 +OTP-16515 +OTP-16528 +OTP-16542 +OTP-16548 |