diff options
Diffstat (limited to 'make')
-rw-r--r-- | make/otp_patch_solve_forward_merge_version | 2 | ||||
-rw-r--r-- | make/otp_version_tickets | 5 | ||||
-rw-r--r-- | make/otp_version_tickets_in_merge | 7 |
3 files changed, 6 insertions, 8 deletions
diff --git a/make/otp_patch_solve_forward_merge_version b/make/otp_patch_solve_forward_merge_version index 7f8f011eb7..45a4fb75db 100644 --- a/make/otp_patch_solve_forward_merge_version +++ b/make/otp_patch_solve_forward_merge_version @@ -1 +1 @@ -7 +8 diff --git a/make/otp_version_tickets b/make/otp_version_tickets index 3207292920..b8220e1a87 100644 --- a/make/otp_version_tickets +++ b/make/otp_version_tickets @@ -1,4 +1 @@ -OTP-15684 -OTP-15685 -OTP-15688 -OTP-15690 +DEVELOPMENT diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index ff967634a2..3207292920 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1,3 +1,4 @@ -OTP-15551 -OTP-15651 -OTP-15652 +OTP-15684 +OTP-15685 +OTP-15688 +OTP-15690 |