Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release
authorffxbld <release@mozilla.com>
Mon, 07 Mar 2016 09:23:22 -0500
changeset 287300 be593a64d7c6a826260514fe758ef32a6ee580f7
parent 287299 552ef9bae23386aa976f28e0d66ed2ae92bc2194
child 287321 7a6ad98de34e7374188231aec6a50eff87781913
push id73149
push userkwierso@gmail.com
push dateWed, 09 Mar 2016 00:08:17 +0000
treeherdermozilla-inbound@41eba362e5a0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrelease
milestone48.0a1
first release with
nightly linux32
be593a64d7c6 / 48.0a1 / 20160307062903 / files
nightly linux64
be593a64d7c6 / 48.0a1 / 20160307062903 / files
nightly mac
be593a64d7c6 / 48.0a1 / 20160307062903 / files
nightly win32
be593a64d7c6 / 48.0a1 / 20160307063917 / files
nightly win64
be593a64d7c6 / 48.0a1 / 20160307063917 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release
CLOBBER
browser/config/version.txt
browser/config/version_display.txt
config/milestone.txt
services/sync/moz.build
xpcom/components/Module.h
--- 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 1246756 - Update Skia to m49 branch.
 
+Merge day clobber
\ No newline at end of file
--- a/browser/config/version.txt
+++ b/browser/config/version.txt
@@ -1,1 +1,1 @@
-47.0a1
+48.0a1
--- a/browser/config/version_display.txt
+++ b/browser/config/version_display.txt
@@ -1,1 +1,1 @@
-47.0a1
+48.0a1
--- a/config/milestone.txt
+++ b/config/milestone.txt
@@ -5,9 +5,9 @@
 #    x.x.x.x
 #    x.x.x+
 #
 # Referenced by milestone.py.
 # Hopefully I'll be able to automate replacement of *all*
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-47.0a1
+48.0a1
--- a/services/sync/moz.build
+++ b/services/sync/moz.build
@@ -37,17 +37,17 @@ EXTRA_JS_MODULES['services-sync'] += [
     'modules/util.js',
 ]
 
 EXTRA_PP_JS_MODULES['services-sync'] += [
     'modules/constants.js',
 ]
 
 # Definitions used by constants.js
-DEFINES['weave_version'] = '1.49.0'
+DEFINES['weave_version'] = '1.50.0'
 DEFINES['weave_id'] = '{340c2bbc-ce74-4362-90b5-7c26312808ef}'
 
 EXTRA_JS_MODULES['services-sync'].engines += [
     'modules/engines/addons.js',
     'modules/engines/bookmarks.js',
     'modules/engines/clients.js',
     'modules/engines/forms.js',
     'modules/engines/history.js',
--- a/xpcom/components/Module.h
+++ b/xpcom/components/Module.h
@@ -17,17 +17,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 = 47;
+  static const unsigned int kVersion = 48;
 
   struct CIDEntry;
 
   typedef already_AddRefed<nsIFactory> (*GetFactoryProcPtr)(
     const Module& module, const CIDEntry& entry);
 
   typedef nsresult (*ConstructorProcPtr)(nsISupports* aOuter,
                                          const nsIID& aIID,