From 934c765169ba0f9836578cb516110c071c462197 Mon Sep 17 00:00:00 2001 From: Mozilla Releng Treescript Date: Mon, 29 Jun 2020 14:38:12 +0000 Subject: [PATCH 1/3] No bug - tagging 921a30cac33b6d0760f318b6f1a2e3ce1bd687cc with FIREFOX_BETA_79_BASE a=release DONTBUILD CLOSED TREE --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 5b37bcb064af..bd0ff4435cd6 100644 --- a/.hgtags +++ b/.hgtags @@ -183,3 +183,4 @@ f53ecf8eee2a0d2a7705d7ea3ec8682028e922a0 FIREFOX_NIGHTLY_74_END 5b8406a0446906d7228e5d745549b50a3496dc0f FIREFOX_NIGHTLY_77_END e4b11f027efc1f8c2710ae3f52487a8f10a8fb39 FIREFOX_BETA_78_BASE 702ad0fa15860f6ea37effdcb45973cc63d3125b FIREFOX_NIGHTLY_78_END +921a30cac33b6d0760f318b6f1a2e3ce1bd687cc FIREFOX_BETA_79_BASE From 8669c4eaff1916705889aaa585d8a67a8c51160b Mon Sep 17 00:00:00 2001 From: Mozilla Releng Treescript Date: Mon, 29 Jun 2020 15:15:37 +0000 Subject: [PATCH 2/3] No bug - tagging 4c7e22cb6a476089657b971f2ebe333c5649a4a9 with FIREFOX_NIGHTLY_79_END a=release DONTBUILD CLOSED TREE --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index bd0ff4435cd6..f1c4f789006f 100644 --- a/.hgtags +++ b/.hgtags @@ -184,3 +184,4 @@ f53ecf8eee2a0d2a7705d7ea3ec8682028e922a0 FIREFOX_NIGHTLY_74_END e4b11f027efc1f8c2710ae3f52487a8f10a8fb39 FIREFOX_BETA_78_BASE 702ad0fa15860f6ea37effdcb45973cc63d3125b FIREFOX_NIGHTLY_78_END 921a30cac33b6d0760f318b6f1a2e3ce1bd687cc FIREFOX_BETA_79_BASE +4c7e22cb6a476089657b971f2ebe333c5649a4a9 FIREFOX_NIGHTLY_79_END From f6180a922b0a838695512fed7ac91d8488f6283b Mon Sep 17 00:00:00 2001 From: Mozilla Releng Treescript Date: Mon, 29 Jun 2020 15:15:46 +0000 Subject: [PATCH 3/3] Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release --- browser/config/version.txt | 2 +- browser/config/version_display.txt | 2 +- config/milestone.txt | 2 +- services/sync/modules/constants.js | 2 +- xpcom/components/Module.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/browser/config/version.txt b/browser/config/version.txt index 20f4e62878a6..194421ac528e 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -79.0a1 +80.0a1 diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt index 20f4e62878a6..194421ac528e 100644 --- a/browser/config/version_display.txt +++ b/browser/config/version_display.txt @@ -1 +1 @@ -79.0a1 +80.0a1 diff --git a/config/milestone.txt b/config/milestone.txt index 504690ca4eea..52dce8bef87b 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -79.0a1 +80.0a1 diff --git a/services/sync/modules/constants.js b/services/sync/modules/constants.js index a870c7a157b9..14d735a37f84 100644 --- a/services/sync/modules/constants.js +++ b/services/sync/modules/constants.js @@ -7,7 +7,7 @@ var EXPORTED_SYMBOLS = []; for (let [key, val] of Object.entries({ // Don't manually modify this line, as it is automatically replaced on merge day // by the gecko_migration.py script. - WEAVE_VERSION: "1.81.0", + WEAVE_VERSION: "1.82.0", // Sync Server API version that the client supports. SYNC_API_VERSION: "1.5", diff --git a/xpcom/components/Module.h b/xpcom/components/Module.h index da97a37a364c..8d3da07b7190 100644 --- a/xpcom/components/Module.h +++ b/xpcom/components/Module.h @@ -21,7 +21,7 @@ namespace mozilla { * via a module loader. */ struct Module { - static const unsigned int kVersion = 79; + static const unsigned int kVersion = 80; struct CIDEntry;