diff --git a/.hgtags b/.hgtags index 7190642d151..c6317565ac4 100644 --- a/.hgtags +++ b/.hgtags @@ -122,3 +122,4 @@ b297a6727acfd21e757ddd38cd61894812666265 FIREFOX_AURORA_36_BASE 7a19194812eb767bee7cdf8fc36ba9a383c1bead FIREFOX_AURORA_42_BASE fcef8ded82219c89298b4e376cfbdfba79a1d35a FIREFOX_AURORA_43_BASE 67a788db9f07822cfef52351bbbe3745dff8bd7f FIREFOX_AURORA_44_BASE +99137d6d4061f408ae0869122649d8bdf489cc30 FIREFOX_AURORA_45_BASE diff --git a/CLOBBER b/CLOBBER index 578ea1f2eac..d4cdfaff33d 100644 --- a/CLOBBER +++ b/CLOBBER @@ -22,5 +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 1210165 - Update ICU to release 56.1. -Bug 966038 - Updating ICU doesn't properly notify the Mozilla build system, necessitating a clobber. +Merge day clobber \ No newline at end of file diff --git a/b2g/confvars.sh b/b2g/confvars.sh index 300d551eb3d..bbdf616047d 100644 --- a/b2g/confvars.sh +++ b/b2g/confvars.sh @@ -5,7 +5,7 @@ MOZ_APP_BASENAME=B2G MOZ_APP_VENDOR=Mozilla -MOZ_APP_VERSION=45.0a1 +MOZ_APP_VERSION=46.0a1 MOZ_APP_UA_NAME=Firefox MOZ_UA_OS_AGNOSTIC=1 diff --git a/browser/config/version.txt b/browser/config/version.txt index e86cbca81f0..5860193beb7 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -45.0a1 +46.0a1 diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt index e86cbca81f0..5860193beb7 100644 --- a/browser/config/version_display.txt +++ b/browser/config/version_display.txt @@ -1 +1 @@ -45.0a1 +46.0a1 diff --git a/config/milestone.txt b/config/milestone.txt index e5195f4eeda..35a9cb60197 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -45.0a1 +46.0a1 diff --git a/services/sync/moz.build b/services/sync/moz.build index c1d9a9042a3..3bdd7862a1e 100644 --- a/services/sync/moz.build +++ b/services/sync/moz.build @@ -46,7 +46,7 @@ EXTRA_PP_JS_MODULES['services-sync'] += [ ] # Definitions used by constants.js -DEFINES['weave_version'] = '1.47.0' +DEFINES['weave_version'] = '1.48.0' DEFINES['weave_id'] = '{340c2bbc-ce74-4362-90b5-7c26312808ef}' EXTRA_JS_MODULES['services-sync'].engines += [ diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json index da041667ac6..0f3c12bf280 100644 --- a/toolkit/components/telemetry/Histograms.json +++ b/toolkit/components/telemetry/Histograms.json @@ -8455,7 +8455,7 @@ }, "LOOP_TWO_WAY_MEDIA_CONN_LENGTH_1": { "alert_emails": ["firefox-dev@mozilla.org", "dmose@mozilla.com"], - "expires_in_version": "46", + "expires_in_version": "47", "kind": "enumerated", "n_values": 8, "releaseChannelCollection": "opt-out", @@ -8463,7 +8463,7 @@ }, "LOOP_SHARING_STATE_CHANGE_1": { "alert_emails": ["firefox-dev@mozilla.org", "mdeboer@mozilla.com"], - "expires_in_version": "46", + "expires_in_version": "47", "kind": "enumerated", "n_values": 8, "releaseChannelCollection": "opt-out", @@ -8471,7 +8471,7 @@ }, "LOOP_SHARING_ROOM_URL": { "alert_emails": ["firefox-dev@mozilla.org", "mdeboer@mozilla.com"], - "expires_in_version": "46", + "expires_in_version": "47", "kind": "enumerated", "n_values": 8, "releaseChannelCollection": "opt-out", @@ -8479,7 +8479,7 @@ }, "LOOP_ROOM_CREATE": { "alert_emails": ["firefox-dev@mozilla.org", "mdeboer@mozilla.com"], - "expires_in_version": "46", + "expires_in_version": "47", "kind": "enumerated", "n_values": 4, "releaseChannelCollection": "opt-out", @@ -8487,7 +8487,7 @@ }, "LOOP_ROOM_DELETE": { "alert_emails": ["firefox-dev@mozilla.org", "mdeboer@mozilla.com"], - "expires_in_version": "46", + "expires_in_version": "47", "kind": "enumerated", "n_values": 4, "releaseChannelCollection": "opt-out", @@ -8495,7 +8495,7 @@ }, "LOOP_ROOM_CONTEXT_ADD": { "alert_emails": ["firefox-dev@mozilla.org", "mdeboer@mozilla.com"], - "expires_in_version": "46", + "expires_in_version": "47", "kind": "enumerated", "n_values": 8, "releaseChannelCollection": "opt-out", @@ -8503,14 +8503,14 @@ }, "LOOP_ROOM_CONTEXT_CLICK": { "alert_emails": ["firefox-dev@mozilla.org", "mdeboer@mozilla.com"], - "expires_in_version": "46", + "expires_in_version": "47", "kind": "count", "releaseChannelCollection": "opt-out", "description": "Number times room context is clicked to visit the attached URL" }, "LOOP_ROOM_SESSION_WITHCHAT": { "alert_emails": ["firefox-dev@mozilla.org", "mdeboer@mozilla.com"], - "expires_in_version": "46", + "expires_in_version": "47", "kind": "count", "releaseChannelCollection": "opt-out", "description": "Number of sessions where at least one chat message was exchanged" @@ -9847,14 +9847,14 @@ }, "FXA_CONFIGURED": { "alert_emails": ["fx-team@mozilla.com"], - "expires_in_version": "46", + "expires_in_version": "47", "kind": "flag", "releaseChannelCollection": "opt-out", "description": "If the user is signed in to a Firefox Account on this device" }, "FXA_UNVERIFIED_ACCOUNT_ERRORS": { "alert_emails": ["fx-team@mozilla.com"], - "expires_in_version": "46", + "expires_in_version": "47", "kind": "count", "keyed": true, "releaseChannelCollection": "opt-out", @@ -9862,7 +9862,7 @@ }, "FXA_HAWK_ERRORS": { "alert_emails": ["fx-team@mozilla.com"], - "expires_in_version": "46", + "expires_in_version": "47", "kind": "count", "keyed": true, "releaseChannelCollection": "opt-out", @@ -9870,7 +9870,7 @@ }, "FXA_SERVER_ERRORS": { "alert_emails": ["fx-team@mozilla.com"], - "expires_in_version": "46", + "expires_in_version": "47", "kind": "count", "keyed": true, "releaseChannelCollection": "opt-out", @@ -9878,7 +9878,7 @@ }, "TOKENSERVER_AUTH_ERRORS": { "alert_emails": ["fx-team@mozilla.com"], - "expires_in_version": "46", + "expires_in_version": "47", "kind": "count", "keyed": true, "releaseChannelCollection": "opt-out", @@ -9886,7 +9886,7 @@ }, "WEAVE_ENGINE_APPLY_NEW_FAILURES": { "alert_emails": ["fx-team@mozilla.com"], - "expires_in_version": "46", + "expires_in_version": "47", "kind": "count", "keyed": true, "releaseChannelCollection": "opt-out", @@ -9894,7 +9894,7 @@ }, "WEAVE_ENGINE_APPLY_FAILURES": { "alert_emails": ["fx-team@mozilla.com"], - "expires_in_version": "46", + "expires_in_version": "47", "kind": "count", "keyed": true, "releaseChannelCollection": "opt-out", @@ -9902,7 +9902,7 @@ }, "WEAVE_ENGINE_SYNC_ERRORS": { "alert_emails": ["fx-team@mozilla.com"], - "expires_in_version": "46", + "expires_in_version": "47", "kind": "count", "keyed": true, "releaseChannelCollection": "opt-out", @@ -9910,21 +9910,21 @@ }, "WEAVE_CAN_FETCH_KEYS": { "alert_emails": ["fx-team@mozilla.com"], - "expires_in_version": "46", + "expires_in_version": "47", "kind": "flag", "releaseChannelCollection": "opt-out", "description": "Whether Sync keys are present in account storage." }, "WEAVE_FXA_KEY_FETCH_ERRORS": { "alert_emails": ["fx-team@mozilla.com"], - "expires_in_version": "46", + "expires_in_version": "47", "kind": "count", "releaseChannelCollection": "opt-out", "description": "Errors encountered fetching Sync keys, including network errors." }, "WEAVE_STORAGE_AUTH_ERRORS": { "alert_emails": ["fx-team@mozilla.com"], - "expires_in_version": "46", + "expires_in_version": "47", "kind": "count", "keyed": true, "releaseChannelCollection": "opt-out", @@ -9932,7 +9932,7 @@ }, "WEAVE_HMAC_ERRORS": { "alert_emails": ["fx-team@mozilla.com"], - "expires_in_version": "46", + "expires_in_version": "47", "kind": "count", "releaseChannelCollection": "opt-out", "description": "Sync cryptoKeys collection HMAC mismatches." diff --git a/xpcom/components/Module.h b/xpcom/components/Module.h index cd45b08725f..0da7be76a53 100644 --- a/xpcom/components/Module.h +++ b/xpcom/components/Module.h @@ -22,7 +22,7 @@ namespace mozilla { */ struct Module { - static const unsigned int kVersion = 45; + static const unsigned int kVersion = 46; struct CIDEntry;