aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
Diffstat (limited to 'make')
-rw-r--r--make/otp_patch_solve_forward_merge_version2
-rw-r--r--make/otp_version_tickets65
-rw-r--r--make/otp_version_tickets_in_merge2
3 files changed, 4 insertions, 65 deletions
diff --git a/make/otp_patch_solve_forward_merge_version b/make/otp_patch_solve_forward_merge_version
index 7ed6ff82de..7f8f011eb7 100644
--- a/make/otp_patch_solve_forward_merge_version
+++ b/make/otp_patch_solve_forward_merge_version
@@ -1 +1 @@
-5
+7
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
index 81a6fb9117..b8220e1a87 100644
--- a/make/otp_version_tickets
+++ b/make/otp_version_tickets
@@ -1,64 +1 @@
-OTP-12242
-OTP-13468
-OTP-14669
-OTP-15094
-OTP-15121
-OTP-15245
-OTP-15302
-OTP-15312
-OTP-15314
-OTP-15338
-OTP-15339
-OTP-15341
-OTP-15343
-OTP-15346
-OTP-15357
-OTP-15360
-OTP-15364
-OTP-15365
-OTP-15368
-OTP-15371
-OTP-15377
-OTP-15378
-OTP-15384
-OTP-15387
-OTP-15388
-OTP-15389
-OTP-15391
-OTP-15400
-OTP-15402
-OTP-15412
-OTP-15413
-OTP-15415
-OTP-15416
-OTP-15418
-OTP-15419
-OTP-15420
-OTP-15424
-OTP-15426
-OTP-15428
-OTP-15435
-OTP-15436
-OTP-15437
-OTP-15446
-OTP-15449
-OTP-15450
-OTP-15453
-OTP-15454
-OTP-15461
-OTP-15463
-OTP-15464
-OTP-15465
-OTP-15466
-OTP-15467
-OTP-15469
-OTP-15470
-OTP-15471
-OTP-15472
-OTP-15473
-OTP-15474
-OTP-15475
-OTP-15476
-OTP-15478
-OTP-15481
-OTP-15482
+DEVELOPMENT
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
new file mode 100644
index 0000000000..32e6923ce9
--- /dev/null
+++ b/make/otp_version_tickets_in_merge
@@ -0,0 +1,2 @@
+OTP-14728
+OTP-15573