From 3615df945976baaad32fde19e154b97bc4e7b8f4 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 5 Sep 2014 09:57:44 -0500 Subject: [PATCH 01/17] Bug 1062745 - Temporary width fix for project button. r=me --- browser/devtools/webide/themes/webide.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/devtools/webide/themes/webide.css b/browser/devtools/webide/themes/webide.css index 4410ddbe6622..09c7544a5e37 100644 --- a/browser/devtools/webide/themes/webide.css +++ b/browser/devtools/webide/themes/webide.css @@ -67,6 +67,8 @@ window.busy-determined #action-busy-undetermined { #project-panel-button { -moz-box-pack: start; + width: 150px; + max-width: 150px; } #project-panel-button > .panel-button-image { @@ -86,6 +88,7 @@ window.busy-determined #action-busy-undetermined { } #project-panel-button > .panel-button-label { + width: 150px; max-width: 150px; } From 8645d53fb91fb3ddadd76cebae50a9e5bbae28ba Mon Sep 17 00:00:00 2001 From: Benjamin Smedberg Date: Fri, 5 Sep 2014 11:17:00 -0400 Subject: [PATCH 02/17] Bug 1053745 - Add GMP plugin data to FHR, r=gfritzsche --HG-- extra : rebase_source : d60d6740369f51168e2d176549b9495df5245143 --- services/healthreport/providers.jsm | 55 ++++++++++++++++++- .../tests/xpcshell/test_provider_addons.js | 41 ++++++++++++++ .../extensions/internal/OpenH264Provider.jsm | 1 + 3 files changed, 95 insertions(+), 2 deletions(-) diff --git a/services/healthreport/providers.jsm b/services/healthreport/providers.jsm index 4258c9405d9f..8f00e96cfc2c 100644 --- a/services/healthreport/providers.jsm +++ b/services/healthreport/providers.jsm @@ -758,6 +758,36 @@ ActivePluginsMeasurement.prototype = Object.freeze({ }, }); +function ActiveGMPluginsMeasurement() { + Metrics.Measurement.call(this); + + this._serializers = {}; + this._serializers[this.SERIALIZE_JSON] = { + singular: this._serializeJSONSingular.bind(this), + }; +} + +ActiveGMPluginsMeasurement.prototype = Object.freeze({ + __proto__: Metrics.Measurement.prototype, + + name: "gm-plugins", + version: 1, + + fields: { + "gm-plugins": LAST_TEXT_FIELD, + }, + + _serializeJSONSingular: function (data) { + if (!data.has("gm-plugins")) { + this._log.warn("Don't have GM plugins info. Weird."); + return null; + } + + let result = JSON.parse(data.get("gm-plugins")[1]); + result._v = this.version; + return result; + }, +}); function AddonCountsMeasurement() { Metrics.Measurement.call(this); @@ -834,6 +864,7 @@ AddonsProvider.prototype = Object.freeze({ measurementTypes: [ ActiveAddonsMeasurement, ActivePluginsMeasurement, + ActiveGMPluginsMeasurement, AddonCountsMeasurement1, AddonCountsMeasurement, ], @@ -869,10 +900,12 @@ AddonsProvider.prototype = Object.freeze({ let data; let addonsField; let pluginsField; + let gmPluginsField; try { data = this._createDataStructure(allAddons); addonsField = JSON.stringify(data.addons); pluginsField = JSON.stringify(data.plugins); + gmPluginsField = JSON.stringify(data.gmPlugins); } catch (ex) { this._log.warn("Exception when populating add-ons data structure: " + CommonUtils.exceptionStr(ex)); @@ -883,6 +916,7 @@ AddonsProvider.prototype = Object.freeze({ let now = new Date(); let addons = this.getMeasurement("addons", 2); let plugins = this.getMeasurement("plugins", 1); + let gmPlugins = this.getMeasurement("gm-plugins", 1); let counts = this.getMeasurement(AddonCountsMeasurement.prototype.name, AddonCountsMeasurement.prototype.version); @@ -901,7 +935,15 @@ AddonsProvider.prototype = Object.freeze({ return addons.setLastText("addons", addonsField).then( function onSuccess() { return plugins.setLastText("plugins", pluginsField).then( - function onSuccess() { deferred.resolve(); }, + function onSuccess() { + return gmPlugins.setLastText("gm-plugins", gmPluginsField).then( + function onSuccess() { + deferred.resolve(); + }, + function onError(error) { + deferred.reject(error); + }); + }, function onError(error) { deferred.reject(error); } ); }, @@ -938,6 +980,7 @@ AddonsProvider.prototype = Object.freeze({ let data = { addons: {}, plugins: {}, + gmPlugins: {}, counts: {} }; @@ -945,8 +988,16 @@ AddonsProvider.prototype = Object.freeze({ let type = addon.type; // We count plugins separately below. - if (addon.type == "plugin") + if (addon.type == "plugin") { + if (addon.gmPlugin) { + data.gmPlugins[addon.id] = { + version: addon.version, + userDisabled: addon.userDisabled, + applyBackgroundUpdates: addon.applyBackgroundUpdates, + }; + } continue; + } data.counts[type] = (data.counts[type] || 0) + 1; diff --git a/services/healthreport/tests/xpcshell/test_provider_addons.js b/services/healthreport/tests/xpcshell/test_provider_addons.js index eb7509668e03..a3aa9752b2e5 100644 --- a/services/healthreport/tests/xpcshell/test_provider_addons.js +++ b/services/healthreport/tests/xpcshell/test_provider_addons.js @@ -116,6 +116,21 @@ add_task(function test_collect() { updateDate: now, description: "addon3 description" }, + { + // Should be excluded from the report completely + id: "pluginfake", + type: "plugin", + userDisabled: false, + appDisabled: false, + }, + { + // Should be in gm-plugins + id: "gmp-testgmp", + type: "plugin", + userDisabled: false, + version: "7.2", + gmPlugin: true, + }, ]; monkeypatchAddons(provider, testAddons); @@ -186,6 +201,8 @@ add_task(function test_collect() { do_check_true(!("addon1" in value)); do_check_true(!("addon2" in value)); do_check_true("addon3" in value); + do_check_true(!("pluginfake" in value)); + do_check_true(!("gmp-testgmp" in value)); let serializer = addons.serializer(addons.SERIALIZE_JSON); let serialized = serializer.singular(data.singular); @@ -237,6 +254,30 @@ add_task(function test_collect() { } do_check_eq(serialized._v, 1); + // Test GMP plugins measurement. + + let gmPlugins = provider.getMeasurement("gm-plugins", 1); + data = yield gmPlugins.getValues(); + + do_check_eq(data.days.size, 0); + do_check_eq(data.singular.size, 1); + do_check_true(data.singular.has("gm-plugins")); + + json = data.singular.get("gm-plugins")[1]; + value = JSON.parse(json); + do_print("value: " + json); + do_check_eq(typeof(value), "object"); + do_check_eq(Object.keys(value).length, 1); + + do_check_eq(value["gmp-testgmp"].version, "7.2"); + do_check_eq(value["gmp-testgmp"].userDisabled, false); + + serializer = gmPlugins.serializer(plugins.SERIALIZE_JSON); + serialized = serializer.singular(data.singular); + do_check_eq(typeof(serialized), "object"); + do_check_eq(serialized["gmp-testgmp"].version, "7.2"); + do_check_eq(serialized._v, 1); + // Test counts measurement. let counts = provider.getMeasurement("counts", 2); diff --git a/toolkit/mozapps/extensions/internal/OpenH264Provider.jsm b/toolkit/mozapps/extensions/internal/OpenH264Provider.jsm index 93517bec8daf..cb6b56eb0194 100644 --- a/toolkit/mozapps/extensions/internal/OpenH264Provider.jsm +++ b/toolkit/mozapps/extensions/internal/OpenH264Provider.jsm @@ -87,6 +87,7 @@ let OpenH264Wrapper = { get id() { return OPENH264_PLUGIN_ID; }, get type() { return "plugin"; }, + get isGMPlugin() { return true; }, get name() { return pluginsBundle.GetStringFromName("openH264_name"); }, get creator() { return null; }, get homepageURL() { return OPENH264_HOMEPAGE_URL; }, From 9bfc003807bfa30ba22953a5340abd1fbeafcafc Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 5 Sep 2014 08:45:32 -0700 Subject: [PATCH 03/17] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/2a85bee097d0 Author: Kevin Grandon Desc: Merge pull request #23749 from KevinGrandon/bug_1063228_fix_search_active_race Bug 1063228 - [Rocketbar] Fix race conditions with active flag ======== https://hg.mozilla.org/integration/gaia-central/rev/6bd0316fa65f Author: Kevin Grandon Desc: Bug 1063228 - [Rocketbar] Fix race conditions with active flag r=apastor --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 339da6273235..8d5295ab8f0b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "4a65d170154483d723a976506190db72ca5d6e6d", + "revision": "2a85bee097d05f8d5f74098f127c6f4b7086eb29", "repo_path": "/integration/gaia-central" } From 1610755bcca7cd31ad90e02f84e03d74a03df653 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 5 Sep 2014 08:57:27 -0700 Subject: [PATCH 04/17] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 2a6e4e2ac6d8..20b1f3d6aa8d 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index fad65ab15355..3c154301d215 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index d7b009f1fb72..f1f97e9eb19a 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index a145deba5db2..1c6b97ede43c 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index fad65ab15355..3c154301d215 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 82250c7edfb0..08e2b4620c91 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 75b100b685ae..a1f31c9a52bd 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 9c58ce0fb006..6252b16c64c9 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index e4b74c634322..9b115cfd06d4 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index fba2811c5899..b1986dbca0e4 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 8183a0b61628..5d2ee1f122c1 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 390bb98bf2a1eb617a4c242d37c20c989df60fe2 Mon Sep 17 00:00:00 2001 From: Richard Newman Date: Fri, 5 Sep 2014 09:38:22 -0700 Subject: [PATCH 05/17] Bug 1063274 - Add getLanguage method to BrowserLocaleManager. r=margaret --- mobile/android/base/BrowserLocaleManager.java | 39 +++++++++++++------ 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/mobile/android/base/BrowserLocaleManager.java b/mobile/android/base/BrowserLocaleManager.java index 23ac49ce2dfe..8194301508a2 100644 --- a/mobile/android/base/BrowserLocaleManager.java +++ b/mobile/android/base/BrowserLocaleManager.java @@ -79,6 +79,32 @@ public class BrowserLocaleManager implements LocaleManager { return AppConstants.MOZ_LOCALE_SWITCHER; } + /** + * Sometimes we want just the language for a locale, not the entire + * language tag. But Java's .getLanguage method is wrong. + * + * This method is equivalent to the first part of {@link #getLanguageTag(Locale)}. + * + * @return a language string, such as "he" for the Hebrew locales. + */ + public static String getLanguage(final Locale locale) { + final String language = locale.getLanguage(); // Can, but should never be, an empty string. + // Modernize certain language codes. + if (language.equals("iw")) { + return "he"; + } + + if (language.equals("in")) { + return "id"; + } + + if (language.equals("ji")) { + return "yi"; + } + + return language; + } + /** * Gecko uses locale codes like "es-ES", whereas a Java {@link Locale} * stringifies as "es_ES". @@ -91,17 +117,8 @@ public class BrowserLocaleManager implements LocaleManager { // If this were Java 7: // return locale.toLanguageTag(); - String language = locale.getLanguage(); // Can, but should never be, an empty string. - // Modernize certain language codes. - if (language.equals("iw")) { - language = "he"; - } else if (language.equals("in")) { - language = "id"; - } else if (language.equals("ji")) { - language = "yi"; - } - - String country = locale.getCountry(); // Can be an empty string. + final String language = getLanguage(locale); + final String country = locale.getCountry(); // Can be an empty string. if (country.equals("")) { return language; } From 40c14fa70b1a08b1e34afadf52ab903b96017976 Mon Sep 17 00:00:00 2001 From: Paul Rouget Date: Fri, 5 Sep 2014 11:38:33 -0500 Subject: [PATCH 06/17] Bug 1062748 - Allow connection-manager to use a custom transport. r=jryans --- toolkit/devtools/client/connection-manager.js | 97 ++++++++++--------- 1 file changed, 52 insertions(+), 45 deletions(-) diff --git a/toolkit/devtools/client/connection-manager.js b/toolkit/devtools/client/connection-manager.js index 11acc40fa8fc..382c2aa98bcb 100644 --- a/toolkit/devtools/client/connection-manager.js +++ b/toolkit/devtools/client/connection-manager.js @@ -23,12 +23,12 @@ Cu.import("resource://gre/modules/devtools/dbg-server.jsm"); * # ConnectionManager * * Methods: - * ⬩ Connection createConnection(host, port) - * ⬩ void destroyConnection(connection) - * ⬩ Number getFreeTCPPort() + * . Connection createConnection(host, port) + * . void destroyConnection(connection) + * . Number getFreeTCPPort() * * Properties: - * ⬩ Array connections + * . Array connections * * # Connection * @@ -38,33 +38,34 @@ Cu.import("resource://gre/modules/devtools/dbg-server.jsm"); * will re-create a debugger client. * * Methods: - * ⬩ connect() Connect to host:port. Expect a "connecting" event. If - * host is not specified, a local pipe is used - * ⬩ disconnect() Disconnect if connected. Expect a "disconnecting" event + * . connect() Connect to host:port. Expect a "connecting" event. + * If no host is not specified, a local pipe is used + * . connect(transport) Connect via transport. Expect a "connecting" event. + * . disconnect() Disconnect if connected. Expect a "disconnecting" event * * Properties: - * ⬩ host IP address or hostname - * ⬩ port Port - * ⬩ logs Current logs. "newlog" event notifies new available logs - * ⬩ store Reference to a local data store (see below) - * ⬩ keepConnecting Should the connection keep trying connecting - * ⬩ status Connection status: - * Connection.Status.CONNECTED - * Connection.Status.DISCONNECTED - * Connection.Status.CONNECTING - * Connection.Status.DISCONNECTING - * Connection.Status.DESTROYED + * . host IP address or hostname + * . port Port + * . logs Current logs. "newlog" event notifies new available logs + * . store Reference to a local data store (see below) + * . keepConnecting Should the connection keep trying connecting + * . status Connection status: + * Connection.Status.CONNECTED + * Connection.Status.DISCONNECTED + * Connection.Status.CONNECTING + * Connection.Status.DISCONNECTING + * Connection.Status.DESTROYED * * Events (as in event-emitter.js): - * ⬩ Connection.Events.CONNECTING Trying to connect to host:port - * ⬩ Connection.Events.CONNECTED Connection is successful - * ⬩ Connection.Events.DISCONNECTING Trying to disconnect from server - * ⬩ Connection.Events.DISCONNECTED Disconnected (at client request, or because of a timeout or connection error) - * ⬩ Connection.Events.STATUS_CHANGED The connection status (connection.status) has changed - * ⬩ Connection.Events.TIMEOUT Connection timeout - * ⬩ Connection.Events.HOST_CHANGED Host has changed - * ⬩ Connection.Events.PORT_CHANGED Port has changed - * ⬩ Connection.Events.NEW_LOG A new log line is available + * . Connection.Events.CONNECTING Trying to connect to host:port + * . Connection.Events.CONNECTED Connection is successful + * . Connection.Events.DISCONNECTING Trying to disconnect from server + * . Connection.Events.DISCONNECTED Disconnected (at client request, or because of a timeout or connection error) + * . Connection.Events.STATUS_CHANGED The connection status (connection.status) has changed + * . Connection.Events.TIMEOUT Connection timeout + * . Connection.Events.HOST_CHANGED Host has changed + * . Connection.Events.PORT_CHANGED Port has changed + * . Connection.Events.NEW_LOG A new log line is available * */ @@ -187,16 +188,21 @@ Connection.prototype = { } }, - connect: function() { + connect: function(transport) { if (this.status == Connection.Status.DESTROYED) { return; } if (!this._client) { - this.log("connecting to " + this.host + ":" + this.port); + this._transport = transport; + if (this._transport) { + this.log("connecting (custom transport)"); + } else { + this.log("connecting to " + this.host + ":" + this.port); + } this._setStatus(Connection.Status.CONNECTING); + let delay = Services.prefs.getIntPref("devtools.debugger.remote-timeout"); this._timeoutID = setTimeout(this._onTimeout, delay); - this._clientConnect(); } else { let msg = "Can't connect. Client is not fully disconnected"; @@ -217,23 +223,24 @@ Connection.prototype = { }, _clientConnect: function () { - let transport; - if (!this.host) { - transport = DebuggerServer.connectPipe(); - } else { - try { - transport = debuggerSocketConnect(this.host, this.port); - } catch (e) { - // In some cases, especially on Mac, the openOutputStream call in - // debuggerSocketConnect may throw NS_ERROR_NOT_INITIALIZED. - // It occurs when we connect agressively to the simulator, - // and keep trying to open a socket to the server being started in - // the simulator. - this._onDisconnected(); - return; + if (!this._transport) { + if (!this.host) { + this._transport = DebuggerServer.connectPipe(); + } else { + try { + this._transport = debuggerSocketConnect(this.host, this.port); + } catch (e) { + // In some cases, especially on Mac, the openOutputStream call in + // debuggerSocketConnect may throw NS_ERROR_NOT_INITIALIZED. + // It occurs when we connect agressively to the simulator, + // and keep trying to open a socket to the server being started in + // the simulator. + this._onDisconnected(); + return; + } } } - this._client = new DebuggerClient(transport); + this._client = new DebuggerClient(this._transport); this._client.addOneTimeListener("closed", this._onDisconnected); this._client.connect(this._onConnected); }, From 0e708afab7e0e88bee0bb2267755b924a10e1c78 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 5 Sep 2014 10:02:55 -0700 Subject: [PATCH 07/17] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 20b1f3d6aa8d..e6f1b8fe34f5 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -120,7 +120,7 @@ - + From 29e81d5adc08aee3eebaec0afe1e0e5fc2d1bde2 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 5 Sep 2014 10:20:46 -0700 Subject: [PATCH 08/17] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/4b3901a5adee Author: Kyle Machulis Desc: Merge pull request #23656 from qdot/1061804-browser-opvar-followup Bug 1061804 - Browser OpVar Customization Fixes ======== https://hg.mozilla.org/integration/gaia-central/rev/d1ecfd6d9cc1 Author: Kyle Machulis Desc: Bug 1061804 - Browser OpVar Customization Fixes --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 8d5295ab8f0b..e150e6baf2ed 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "2a85bee097d05f8d5f74098f127c6f4b7086eb29", + "revision": "4b3901a5adeeeeaba92b61c35ac531dfb8936bb0", "repo_path": "/integration/gaia-central" } From 6f6b8888b3277e0c738d35247841b5fd961d2f04 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 5 Sep 2014 10:27:00 -0700 Subject: [PATCH 09/17] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index e6f1b8fe34f5..409a785a886f 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 3c154301d215..a2bdc537c687 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index f1f97e9eb19a..9df16e89ba91 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 1c6b97ede43c..2b2c1f6b24fd 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 3c154301d215..a2bdc537c687 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 08e2b4620c91..7031379095eb 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index a1f31c9a52bd..b8251ef2fef2 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 6252b16c64c9..a5fac73f4954 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 9b115cfd06d4..05181f20d86a 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index b1986dbca0e4..6a00c70a9dd8 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 5d2ee1f122c1..6846b6dbaee5 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From e0deadf58e45e71f915bbea21e5c6c6e4f437898 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 5 Sep 2014 10:35:45 -0700 Subject: [PATCH 10/17] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/56c0ac3a55d8 Author: Chris Lord Desc: Merge pull request #23763 from Cwiiis/bug1063487-fix-calendar-oauth Bug 1063487 - Fix Calendar oauth window. r=mmedeiros ======== https://hg.mozilla.org/integration/gaia-central/rev/09b18c337dc6 Author: Chris Lord Desc: Bug 1063487 - Fix Calendar oauth window. r=mmedeiros ======== https://hg.mozilla.org/integration/gaia-central/rev/0d6c35ffec2c Author: Kevin Grandon Desc: Merge pull request #23755 from crdlc/bug-1063398 Bug 1063398 - lastTouchStart is null after context menu events in collection and search views r=kgrandon ======== https://hg.mozilla.org/integration/gaia-central/rev/60e99d211f51 Author: crdlc Desc: Bug 1063398 - lastTouchStart is null after context menu events in collection and search views --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index e150e6baf2ed..3259c25a6dd6 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "4b3901a5adeeeeaba92b61c35ac531dfb8936bb0", + "revision": "56c0ac3a55d8c2778ef4925ba441fe7c4b609450", "repo_path": "/integration/gaia-central" } From a2a151fe89e420b683c028733a3a1b361bf7c9b1 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 5 Sep 2014 10:42:11 -0700 Subject: [PATCH 11/17] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 409a785a886f..de14ff27c9d9 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index a2bdc537c687..7953d984a14c 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 9df16e89ba91..18fbffa41fad 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 2b2c1f6b24fd..c10c1cb897db 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index a2bdc537c687..7953d984a14c 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 7031379095eb..f249654ce3eb 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index b8251ef2fef2..96cade3dd0f3 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index a5fac73f4954..9170264ea079 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 05181f20d86a..efd2528fdfa8 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 6a00c70a9dd8..4ee8a9cfebe6 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 6846b6dbaee5..5c85fab617f1 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 5ea676ecde8e7fb42c6d133a404a5f3a7bc8cb26 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 5 Sep 2014 11:55:45 -0700 Subject: [PATCH 12/17] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/b97f6609ff3a Author: Kevin Grandon Desc: Merge pull request #23770 from KevinGrandon/bug_1062119_start_stop_progress Bug 1062119 - Do not animate gaia-progress by default ======== https://hg.mozilla.org/integration/gaia-central/rev/bf5a78f131f3 Author: Kevin Grandon Desc: Bug 1062119 - Do not animate gaia-progress by default r=gsvelto --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 3259c25a6dd6..fb37b5fe84c2 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "56c0ac3a55d8c2778ef4925ba441fe7c4b609450", + "revision": "b97f6609ff3adfb30e7530f932e6ceae93c5b2f1", "repo_path": "/integration/gaia-central" } From 04dc80a8fdcc4e59e3e4fb8a4fe61d7d29742461 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 5 Sep 2014 11:57:38 -0700 Subject: [PATCH 13/17] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index de14ff27c9d9..f0f78fa628c5 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 7953d984a14c..3d3bfd6a5fbd 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 18fbffa41fad..6a1dc6502ce1 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index c10c1cb897db..563fbe2dcbaa 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 7953d984a14c..3d3bfd6a5fbd 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index f249654ce3eb..64639a44968a 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 96cade3dd0f3..381048a76aa4 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 9170264ea079..02301e51251e 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index efd2528fdfa8..7a9358c944f3 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 4ee8a9cfebe6..d76dfc84a3bb 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 5c85fab617f1..cba78a07644d 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 573218568cd903639a41eff411054629bc0d684f Mon Sep 17 00:00:00 2001 From: Monica Chew Date: Fri, 5 Sep 2014 12:04:26 -0700 Subject: [PATCH 14/17] Bug 1030135: Enable pinning on services.mozilla.com in test mode (r=keeler,a=kwierso) --- security/manager/boot/src/StaticHPKPins.h | 21 ++++++++++---------- security/manager/tools/PreloadedHPKPins.json | 8 +++++--- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/security/manager/boot/src/StaticHPKPins.h b/security/manager/boot/src/StaticHPKPins.h index 07b6ed0c44f5..19c204523dce 100644 --- a/security/manager/boot/src/StaticHPKPins.h +++ b/security/manager/boot/src/StaticHPKPins.h @@ -486,17 +486,17 @@ static const StaticPinset kPinset_mozilla = { &kPinset_mozilla_sha256 }; -static const char* kPinset_mozilla_fxa_sha256_Data[] = { +static const char* kPinset_mozilla_services_sha256_Data[] = { kDigiCert_Global_Root_CAFingerprint, }; -static const StaticFingerprints kPinset_mozilla_fxa_sha256 = { - sizeof(kPinset_mozilla_fxa_sha256_Data) / sizeof(const char*), - kPinset_mozilla_fxa_sha256_Data +static const StaticFingerprints kPinset_mozilla_services_sha256 = { + sizeof(kPinset_mozilla_services_sha256_Data) / sizeof(const char*), + kPinset_mozilla_services_sha256_Data }; -static const StaticPinset kPinset_mozilla_fxa = { +static const StaticPinset kPinset_mozilla_services = { nullptr, - &kPinset_mozilla_fxa_sha256 + &kPinset_mozilla_services_sha256 }; static const char* kPinset_mozilla_test_sha256_Data[] = { @@ -751,13 +751,13 @@ struct TransportSecurityPreload { /* Sort hostnames for binary search. */ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = { { "2mdn.net", true, false, false, -1, &kPinset_google_root_pems }, - { "accounts.firefox.com", true, false, false, 4, &kPinset_mozilla_fxa }, + { "accounts.firefox.com", true, false, false, 4, &kPinset_mozilla_services }, { "accounts.google.com", true, false, false, -1, &kPinset_google_root_pems }, { "addons.mozilla.net", true, false, true, 2, &kPinset_mozilla }, { "addons.mozilla.org", true, false, true, 1, &kPinset_mozilla }, { "admin.google.com", true, false, false, -1, &kPinset_google_root_pems }, { "android.com", true, false, false, -1, &kPinset_google_root_pems }, - { "api.accounts.firefox.com", true, false, false, 5, &kPinset_mozilla_fxa }, + { "api.accounts.firefox.com", true, false, false, 5, &kPinset_mozilla_services }, { "api.twitter.com", true, false, false, -1, &kPinset_twitterCDN }, { "apis.google.com", true, false, false, -1, &kPinset_google_root_pems }, { "appengine.google.com", true, false, false, -1, &kPinset_google_root_pems }, @@ -1043,6 +1043,7 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = { { "profiles.google.com", true, false, false, -1, &kPinset_google_root_pems }, { "script.google.com", true, false, false, -1, &kPinset_google_root_pems }, { "security.google.com", true, false, false, -1, &kPinset_google_root_pems }, + { "services.mozilla.com", true, true, false, -1, &kPinset_mozilla_services }, { "sites.google.com", true, false, false, -1, &kPinset_google_root_pems }, { "spreadsheets.google.com", true, false, false, -1, &kPinset_google_root_pems }, { "ssl.google-analytics.com", true, false, false, -1, &kPinset_google_root_pems }, @@ -1082,8 +1083,8 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = { { "ytimg.com", true, false, false, -1, &kPinset_google_root_pems }, }; -// Pinning Preload List Length = 330; +// Pinning Preload List Length = 331; static const int32_t kUnknownId = -1; -static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1417860919825000); +static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1418406258075000); diff --git a/security/manager/tools/PreloadedHPKPins.json b/security/manager/tools/PreloadedHPKPins.json index 05d1ebb4c4dc..96367eced8e7 100644 --- a/security/manager/tools/PreloadedHPKPins.json +++ b/security/manager/tools/PreloadedHPKPins.json @@ -94,7 +94,7 @@ ] }, { - "name": "mozilla_fxa", + "name": "mozilla_services", "sha256_hashes": [ "DigiCert Global Root CA" ] @@ -207,15 +207,17 @@ { "name": "aus4.mozilla.org", "include_subdomains": true, "pins": "mozilla", "test_mode": true, "id": 3 }, { "name": "accounts.firefox.com", "include_subdomains": true, - "pins": "mozilla_fxa", "test_mode": false, "id": 4 }, + "pins": "mozilla_services", "test_mode": false, "id": 4 }, { "name": "api.accounts.firefox.com", "include_subdomains": true, - "pins": "mozilla_fxa", "test_mode": false, "id": 5 }, + "pins": "mozilla_services", "test_mode": false, "id": 5 }, { "name": "cdn.mozilla.net", "include_subdomains": true, "pins": "mozilla", "test_mode": false }, { "name": "cdn.mozilla.org", "include_subdomains": true, "pins": "mozilla", "test_mode": false }, { "name": "media.mozilla.com", "include_subdomains": true, "pins": "mozilla", "test_mode": false }, + { "name": "services.mozilla.com", "include_subdomains": true, + "pins": "mozilla_services", "test_mode": true }, { "name": "include-subdomains.pinning.example.com", "include_subdomains": true, "pins": "mozilla_test", "test_mode": false }, From 360c90f078b5e7565caf15866d373450bbdfdff7 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 5 Sep 2014 12:10:47 -0700 Subject: [PATCH 15/17] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e7a7c126f48f Author: Michael Henretty Desc: Merge pull request #22124 from giovannic/dialog Dialog ======== https://hg.mozilla.org/integration/gaia-central/rev/b05413a6b8ac Author: Giovanni Charles Desc: Bug 1043556 - Switch shared custom dialogs from using strings to using l10nIds r=alive r=mhenretty sr=dflanagan --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index fb37b5fe84c2..271b736e1b80 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "b97f6609ff3adfb30e7530f932e6ceae93c5b2f1", + "revision": "e7a7c126f48f4ea3bded1f2e9ee5e4f79ae1be9e", "repo_path": "/integration/gaia-central" } From 0dc79356ad7c6a06486710c632357296b18d19fd Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 5 Sep 2014 12:16:59 -0700 Subject: [PATCH 16/17] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index f0f78fa628c5..d79f75abac29 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 3d3bfd6a5fbd..c8d85cf06986 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 6a1dc6502ce1..274508fca89a 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 563fbe2dcbaa..f7d438230fb0 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 3d3bfd6a5fbd..c8d85cf06986 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 64639a44968a..f881ea4be0fe 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 381048a76aa4..39be0ab691ee 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 02301e51251e..73c56e106268 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 7a9358c944f3..66530c8e1820 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index d76dfc84a3bb..46d7f3e3fce8 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index cba78a07644d..01b6abb9ea96 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 02a10d92a50dcbe6ff3035c6e81faab09a016e49 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 5 Sep 2014 13:37:28 -0700 Subject: [PATCH 17/17] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index d79f75abac29..85a947e8d3b5 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index c8d85cf06986..e72b2c1bc6fd 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -25,7 +25,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 274508fca89a..f3100eea9563 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index f7d438230fb0..67940d3949b1 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index c8d85cf06986..e72b2c1bc6fd 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -25,7 +25,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index f881ea4be0fe..6c1380b4cb1a 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 39be0ab691ee..4734af2d2dfb 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 73c56e106268..42b12e9bb448 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -22,7 +22,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 46d7f3e3fce8..8b0d19d9fb60 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 01b6abb9ea96..4d8749579eec 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -22,7 +22,7 @@ - +