From b9bcf6abd965b7742bebae042c6d5c42fce559c4 Mon Sep 17 00:00:00 2001 From: Mozilla Releng Treescript <release+treescript@mozilla.org> Date: Mon, 4 Apr 2022 15:55:18 +0000 Subject: [PATCH] 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.js | 2 +- xpcom/components/Module.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CLOBBER b/CLOBBER index d4cdfaff33de3..92d152a067d58 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. -Merge day clobber \ No newline at end of file +Merge day clobber 2022-04-04 \ No newline at end of file diff --git a/browser/config/version.txt b/browser/config/version.txt index fef6e2b262ada..379bc71cfd9f7 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -100.0a1 +101.0a1 diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt index fef6e2b262ada..379bc71cfd9f7 100644 --- a/browser/config/version_display.txt +++ b/browser/config/version_display.txt @@ -1 +1 @@ -100.0a1 +101.0a1 diff --git a/config/milestone.txt b/config/milestone.txt index b0119374907cc..689995912eb58 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -100.0a1 +101.0a1 diff --git a/services/sync/modules/constants.js b/services/sync/modules/constants.js index a0d1620f915f7..bf4025ae6e0a9 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.102.0", + WEAVE_VERSION: "1.103.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 de8730f3c2ff9..fcdfb39974a13 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 = 100; + static const unsigned int kVersion = 101; struct CIDEntry; -- GitLab