mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge m-c to b-i

This commit is contained in:
Phil Ringnalda 2015-12-14 22:24:34 -08:00
Родитель d24335acfc f2e16d8160
Коммит 33ec01d17c
9 изменённых файлов: 28 добавлений и 28 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
.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

3
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

2
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

2
browser/config/version.txt
Просмотреть файл

@ -1 +1 @@
45.0a1
46.0a1

2
browser/config/version_display.txt
Просмотреть файл

@ -1 +1 @@
45.0a1
46.0a1

2
config/milestone.txt
Просмотреть файл

@ -10,4 +10,4 @@
# hardcoded milestones in the tree from these two files.
#--------------------------------------------------------
45.0a1
46.0a1

2
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 += [

40
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"
@ -9833,14 +9833,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",
@ -9848,7 +9848,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",
@ -9856,7 +9856,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",
@ -9864,7 +9864,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",
@ -9872,7 +9872,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",
@ -9880,7 +9880,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",
@ -9888,7 +9888,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",
@ -9896,21 +9896,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",
@ -9918,7 +9918,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."

2
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;