diff options
| author | Rickard Green <[email protected]> | 2019-03-19 14:17:44 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-03-19 14:17:44 +0100 |
| commit | ba118afbcd433b545ad0d528dec3b9cda19937c4 (patch) | |
| tree | f0d1cfc7ec3495a1e092fa10a8411f79d817550c /make | |
| parent | ef67e6a44cf1c87b8221cb652995b82ea1c9e728 (diff) | |
| parent | a4f71b669ad9ece1a4afa671601c7c72dc89f042 (diff) | |
| download | otp-ba118afbcd433b545ad0d528dec3b9cda19937c4.tar.gz otp-ba118afbcd433b545ad0d528dec3b9cda19937c4.tar.bz2 otp-ba118afbcd433b545ad0d528dec3b9cda19937c4.zip | |
Merge branch 'maint-21' into maint
* maint-21:
Updated OTP version
Prepare release
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp_version_tickets | 80 | ||||
| -rw-r--r-- | make/otp_version_tickets_in_merge | 6 |
2 files changed, 4 insertions, 82 deletions
diff --git a/make/otp_version_tickets b/make/otp_version_tickets index 77633c2ce2..b8220e1a87 100644 --- a/make/otp_version_tickets +++ b/make/otp_version_tickets @@ -1,79 +1 @@ -OTP-14702 -OTP-15229 -OTP-15298 -OTP-15369 -OTP-15375 -OTP-15398 -OTP-15423 -OTP-15442 -OTP-15445 -OTP-15447 -OTP-15460 -OTP-15479 -OTP-15484 -OTP-15490 -OTP-15493 -OTP-15494 -OTP-15498 -OTP-15502 -OTP-15503 -OTP-15508 -OTP-15514 -OTP-15518 -OTP-15519 -OTP-15527 -OTP-15529 -OTP-15539 -OTP-15540 -OTP-15541 -OTP-15542 -OTP-15545 -OTP-15552 -OTP-15553 -OTP-15555 -OTP-15556 -OTP-15557 -OTP-15558 -OTP-15561 -OTP-15562 -OTP-15567 -OTP-15569 -OTP-15570 -OTP-15572 -OTP-15576 -OTP-15577 -OTP-15578 -OTP-15580 -OTP-15583 -OTP-15584 -OTP-15586 -OTP-15587 -OTP-15592 -OTP-15599 -OTP-15600 -OTP-15601 -OTP-15602 -OTP-15604 -OTP-15605 -OTP-15619 -OTP-15624 -OTP-15625 -OTP-15629 -OTP-15630 -OTP-15634 -OTP-15637 -OTP-15639 -OTP-15642 -OTP-15647 -OTP-15650 -OTP-15654 -OTP-15657 -OTP-15659 -OTP-15660 -OTP-15662 -OTP-15663 -OTP-15665 -OTP-15666 -OTP-15667 -OTP-15669 -OTP-15670 +DEVELOPMENT diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index ff967634a2..cfd555fd49 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1,3 +1,3 @@ -OTP-15551 -OTP-15651 -OTP-15652 +OTP-14701 +OTP-15676 +OTP-15679 |