From 426de7d9bd0b64f95ff6a55d3ed422374c13581a Mon Sep 17 00:00:00 2001 From: ffxbld Date: Mon, 2 Sep 2019 09:00:31 +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 1a5a89cb7d5f..d4cdfaff33de 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. -Bug 1575774 (caused by bug 844509) +Merge day clobber \ No newline at end of file diff --git a/browser/config/version.txt b/browser/config/version.txt index b109d50e9e98..84d10a0836df 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -70.0a1 +71.0a1 diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt index b109d50e9e98..84d10a0836df 100644 --- a/browser/config/version_display.txt +++ b/browser/config/version_display.txt @@ -1 +1 @@ -70.0a1 +71.0a1 diff --git a/config/milestone.txt b/config/milestone.txt index 1be7b8ec0695..fc3d4a51703f 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -70.0a1 +71.0a1 diff --git a/services/sync/modules/constants.js b/services/sync/modules/constants.js index ac33ec7f204b..9cbdf1e9e374 100644 --- a/services/sync/modules/constants.js +++ b/services/sync/modules/constants.js @@ -8,7 +8,7 @@ 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.72.0", +WEAVE_VERSION: "1.73.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 c73c45b3d68d..ba3948215d68 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 = 70; + static const unsigned int kVersion = 71; struct CIDEntry;