author | ffxbld <release@mozilla.com> |
Mon, 22 Oct 2018 08:50:03 -0700 | |
changeset 498729 | f92df1fed2748ca8e3f822490a5ae0aa7712bfcf |
parent 498728 | b086d86532ca1dbd73f5cf7987201f5eeba823b1 |
child 498730 | 201d73cddf061e02219067e7cab2ed3780d7ef87 |
push id | 10290 |
push user | ffxbld-merge |
push date | Mon, 03 Dec 2018 16:23:23 +0000 |
treeherder | mozilla-beta@700bed2445e6 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | release |
milestone | 65.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/CLOBBER +++ b/CLOBBER @@ -17,10 +17,10 @@ # # Modifying this file will now automatically clobber the buildbot machines \o/ # # Are you updating CLOBBER because you think it's needed for your WebIDL # changes to stick? As of bug 928195, this shouldn't be necessary! Please # don't change CLOBBER for WebIDL changes any more. -Bug 1488813 - Migrating Pocket off any bootstrap code +Merge day clobber \ No newline at end of file
--- a/browser/config/version_display.txt +++ b/browser/config/version_display.txt @@ -1,1 +1,1 @@ -64.0a1 +65.0a1
--- a/config/milestone.txt +++ b/config/milestone.txt @@ -5,9 +5,9 @@ # x.x.x.x # x.x.x+ # # Referenced by build/moz.configure/init.configure. # Hopefully I'll be able to automate replacement of *all* # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -64.0a1 +65.0a1
--- a/services/sync/modules/constants.js +++ b/services/sync/modules/constants.js @@ -3,17 +3,17 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ // Process each item in the "constants hash" to add to "global" and give a name 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.66.0", +WEAVE_VERSION: "1.67.0", // Sync Server API version that the client supports. SYNC_API_VERSION: "1.5", // Version of the data format this client supports. The data format describes // how records are packaged; this is separate from the Server API version and // the per-engine cleartext formats. STORAGE_VERSION: 5,
--- a/xpcom/components/Module.h +++ b/xpcom/components/Module.h @@ -18,17 +18,17 @@ namespace mozilla { /** * A module implements one or more XPCOM components. This structure is used * for both binary and script modules, but the registration members * (cids/contractids/categoryentries) are unused for modules which are loaded * via a module loader. */ struct Module { - static const unsigned int kVersion = 64; + static const unsigned int kVersion = 65; struct CIDEntry; typedef already_AddRefed<nsIFactory> (*GetFactoryProcPtr)( const Module& module, const CIDEntry& entry); typedef nsresult (*ConstructorProcPtr)(nsISupports* aOuter, const nsIID& aIID,