From bfd7f1373472381e4aaa01582d464b9b915229a6 Mon Sep 17 00:00:00 2001 From: Mozilla Releng Treescript Date: Mon, 25 Sep 2023 12:49:36 +0000 Subject: [PATCH 1/3] No bug - tagging 68035862c82691cc5ad039c1067c1fd24d048350 with FIREFOX_BETA_119_BASE a=release DONTBUILD CLOSED TREE --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 12f66e7785bd..64a26081b8ce 100644 --- a/.hgtags +++ b/.hgtags @@ -269,3 +269,4 @@ f8fa7749f7bdc93fa3491918a4e8b0fb4db659eb FIREFOX_BETA_115_BASE 7b63ca6bbdfaf5d4dc027f808de9f74789a5fa6e FIREFOX_NIGHTLY_117_END 6aaf2cf582814f5a76c09fa2ac7cc760a5886134 FIREFOX_BETA_118_BASE 1429ba8bcd5b6beb45399f77673bc59439db5d91 FIREFOX_NIGHTLY_118_END +68035862c82691cc5ad039c1067c1fd24d048350 FIREFOX_BETA_119_BASE From 9564687816de6f00934c65e91115abbb36525591 Mon Sep 17 00:00:00 2001 From: Mozilla Releng Treescript Date: Mon, 25 Sep 2023 13:56:42 +0000 Subject: [PATCH 2/3] No bug - tagging b8084fc54e158a2adcdac710ea0c3a7c9559309e with FIREFOX_NIGHTLY_119_END a=release DONTBUILD CLOSED TREE --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 64a26081b8ce..6e4a99e69b32 100644 --- a/.hgtags +++ b/.hgtags @@ -270,3 +270,4 @@ f8fa7749f7bdc93fa3491918a4e8b0fb4db659eb FIREFOX_BETA_115_BASE 6aaf2cf582814f5a76c09fa2ac7cc760a5886134 FIREFOX_BETA_118_BASE 1429ba8bcd5b6beb45399f77673bc59439db5d91 FIREFOX_NIGHTLY_118_END 68035862c82691cc5ad039c1067c1fd24d048350 FIREFOX_BETA_119_BASE +b8084fc54e158a2adcdac710ea0c3a7c9559309e FIREFOX_NIGHTLY_119_END From e242e3084e2fd7e71f02b2e2e9cf0eab60daef59 Mon Sep 17 00:00:00 2001 From: Mozilla Releng Treescript Date: Mon, 25 Sep 2023 13:56:52 +0000 Subject: [PATCH 3/3] Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release --- CLOBBER | 2 +- browser/config/version.txt | 2 +- browser/config/version_display.txt | 2 +- config/milestone.txt | 2 +- services/sync/modules/constants.sys.mjs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CLOBBER b/CLOBBER index f97fd436d674..6d010e2b2f3e 100644 --- a/CLOBBER +++ b/CLOBBER @@ -22,4 +22,4 @@ # changes to stick? As of bug 928195, this shouldn't be necessary! Please # don't change CLOBBER for WebIDL changes any more. -Modified build files in third_party/libwebrtc - Bug 1774628 - re-enable support for Windows.Graphics.Capture APIs in libwebrtc. - moz.build file updates. r?pehrsons! +Merge day clobber 2023-09-25 \ No newline at end of file diff --git a/browser/config/version.txt b/browser/config/version.txt index 97f671475e68..f5d18d2f71bc 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -119.0a1 +120.0a1 diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt index 97f671475e68..f5d18d2f71bc 100644 --- a/browser/config/version_display.txt +++ b/browser/config/version_display.txt @@ -1 +1 @@ -119.0a1 +120.0a1 diff --git a/config/milestone.txt b/config/milestone.txt index 22733cdfcf17..df7d85faf041 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -119.0a1 +120.0a1 diff --git a/services/sync/modules/constants.sys.mjs b/services/sync/modules/constants.sys.mjs index 14c3cca87a72..c72d458b4521 100644 --- a/services/sync/modules/constants.sys.mjs +++ b/services/sync/modules/constants.sys.mjs @@ -4,7 +4,7 @@ // Don't manually modify this line, as it is automatically replaced on merge day // by the gecko_migration.py script. -export const WEAVE_VERSION = "1.121.0"; +export const WEAVE_VERSION = "1.122.0"; // Sync Server API version that the client supports. export const SYNC_API_VERSION = "1.5";