From fb69c5527adee98350af8bee63e77f0e0d25edc9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 10 Mar 2014 14:18:46 -0700 Subject: [PATCH 01/47] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/14be4007babb Author: Fabrice Desré Desc: Merge pull request #17034 from vvuk/tiling Add default tiles pref settings to Gaia ======== https://hg.mozilla.org/integration/gaia-central/rev/e7874fb2468a Author: Vladimir Vukicevic Desc: b=981733, Add more tiles prefs to Gaia, and have default settings in common-settings.json, r=21 ======== https://hg.mozilla.org/integration/gaia-central/rev/a5513c842e8c Author: Jan Keromnes Desc: Merge pull request #17036 from jankeromnes/appwindow Bug 980332 - Infinite loop in apps/system/js/devtools_view.js. r=janx ======== https://hg.mozilla.org/integration/gaia-central/rev/9aeb5497db4d Author: Vivien Nicolas <21@vingtetun.org> Desc: Bug 980332 - Infinite loop in apps/system/js/devtools_view.js. r=janx --- 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 e043faa74b65..f28b61795278 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "c5bd933fe99317a7e99822f2d9345ae67a3043df", + "revision": "14be4007babb39fdaf461aeee8b12310dd49d635", "repo_path": "/integration/gaia-central" } From c2d45d455c0e529a6197492230799ce51824143e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 10 Mar 2014 14:18:56 -0700 Subject: [PATCH 02/47] Bumping manifests a=b2g-bump --- 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/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 14d2d071cf2a..67d208b6236a 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 242f5c11cc40..80f2e3fb12bc 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 d93d41600b3d..2d3b4cbfbc87 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 14d2d071cf2a..67d208b6236a 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 8d741c0638ba..c6f436ba2064 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 1693f0f93c75..e4794a6116dd 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 30f9065f1762..375953d3476c 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 09de64da9f3b..295e43d9c468 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index d1da73c588bf..d431c2fbc468 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 75b35f1e6a9b..68870893d02e 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 99d72ce80e4acfbacb731b840890d21d9bd4cbb3 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 10 Mar 2014 15:45:35 -0700 Subject: [PATCH 03/47] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/1075fe0b40a1 Author: Andrew Sutherland Desc: Merge pull request #17041 from asutherland/email-wait-for-greeting Bug 977867 - [email/IMAP] wait for server greeting before sending commands to workaround gmail issue. r=mcav a=blocking-b2g=1.3+ ======== https://hg.mozilla.org/integration/gaia-central/rev/a1d191223f3d Author: Andrew Sutherland Desc: Bug 977867 - [email/IMAP] wait for server greeting before sending commands to workaround gmail issue. r=mcav land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/291 --- 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 f28b61795278..412b46fcbbd4 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "14be4007babb39fdaf461aeee8b12310dd49d635", + "revision": "1075fe0b40a1c2205eef5eeee97f8df17e01e208", "repo_path": "/integration/gaia-central" } From 441940b623d1cdac971ede0f3dfae2e7d1cd57a6 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 10 Mar 2014 15:51:16 -0700 Subject: [PATCH 04/47] Bumping manifests a=b2g-bump --- 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/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 67d208b6236a..194337277b66 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 80f2e3fb12bc..e414ea7d9fd7 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 2d3b4cbfbc87..a3174b1093c4 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 67d208b6236a..194337277b66 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index c6f436ba2064..e60c6d369986 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 e4794a6116dd..c116e53ea30c 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 375953d3476c..c2c910bb6dad 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 295e43d9c468..68309eae5ab6 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index d431c2fbc468..b202f4ce2ed3 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 68870893d02e..59cef2a4172a 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From bc03dcff89e819009778c50917c211763a3f139a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 10 Mar 2014 19:30:25 -0700 Subject: [PATCH 05/47] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/6b4220465f38 Author: steveck-chung Desc: Merge pull request #16951 from steveck-chung/Bug-976999 Bug 976999 - [Sora][Message][MMS]Some of the text content lost when forward the MMS. r=julienw ======== https://hg.mozilla.org/integration/gaia-central/rev/054964ce6a67 Author: Steve Chung Desc: Bug 976999 - [Sora][Message][MMS]Some of the text content lost when forward the MMS --- 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 412b46fcbbd4..40d13fa89fe5 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "1075fe0b40a1c2205eef5eeee97f8df17e01e208", + "revision": "6b4220465f3874e533cf4b38f1a53cf0578639b0", "repo_path": "/integration/gaia-central" } From c63b717a8716c047ae2e7dc6af9fc9dd3bec4df3 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 10 Mar 2014 19:36:04 -0700 Subject: [PATCH 06/47] Bumping manifests a=b2g-bump --- 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/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 194337277b66..45681a0536ac 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 e414ea7d9fd7..ec7943d473ac 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 a3174b1093c4..48ca107cd571 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 194337277b66..45681a0536ac 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index e60c6d369986..652b5ffddd31 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 c116e53ea30c..c8971c836920 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index c2c910bb6dad..fa3dbfe101e1 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 68309eae5ab6..6d5f86cf197e 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index b202f4ce2ed3..0fcda2c6af8a 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 59cef2a4172a..169fdca38048 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 858c7be12fc38ef0115618c9c1eb681bd60da404 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 10 Mar 2014 20:35:26 -0700 Subject: [PATCH 07/47] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/07512015f5bf Author: Alive.Kuo Desc: Merge pull request #17030 from Pike/bug-957674-fix-l10n bug 957674, fix string IDs for l10n. r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/660ea84a7222 Author: Axel Hecht Desc: bug 957674, fix string IDs for l10n. r=alive --- 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 40d13fa89fe5..8eba1c4000e3 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "6b4220465f3874e533cf4b38f1a53cf0578639b0", + "revision": "07512015f5bf64f256bbfc1ad817444231f40a81", "repo_path": "/integration/gaia-central" } From 3452266d0e30e61dd27e527831ad83244d4a81ec Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 10 Mar 2014 20:41:01 -0700 Subject: [PATCH 08/47] Bumping manifests a=b2g-bump --- 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/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 45681a0536ac..3a2266da714a 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 ec7943d473ac..a8cab587dc16 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 48ca107cd571..70a89a3050b2 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 45681a0536ac..3a2266da714a 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 652b5ffddd31..901f085c8133 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 c8971c836920..e99ac31da394 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index fa3dbfe101e1..20a62ed5423c 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 6d5f86cf197e..7e57a6e848f9 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 0fcda2c6af8a..858168682fd4 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 169fdca38048..537d8ddd32b7 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From ace2c9bcea108c889ccc560d14210fb9396598ed Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 10 Mar 2014 21:10:26 -0700 Subject: [PATCH 09/47] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/8bca26da73b4 Author: Alive.Kuo Desc: Merge pull request #17016 from alivedise/bugzilla/977934_master_v4/render-activity-inside-caller Bug 977934 - Render activity frame inside its caller, r=etienne ======== https://hg.mozilla.org/integration/gaia-central/rev/0e31d1af1e9d Author: Alive Kuo Desc: Bug 977934 - Render activity frame inside its caller ======== https://hg.mozilla.org/integration/gaia-central/rev/2adcd9949b1b Author: Dominic Kuo Desc: Merge pull request #16964 from dominickuo/bug-973156-new-2 Bug 973156 - [Music] Send mozinterruptbegin and mozinterruptend to system for show/hide the media playback widget, r=jimporter ======== https://hg.mozilla.org/integration/gaia-central/rev/722535f2aa0c Author: Dominic Kuo Desc: Bug 973156 - [Music] Send mozinterruptbegin and mozinterruptend to system for show/hide the media playback widget --- 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 8eba1c4000e3..4b18859f5764 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "07512015f5bf64f256bbfc1ad817444231f40a81", + "revision": "8bca26da73b461182dc8e8b9177b780dae64ce61", "repo_path": "/integration/gaia-central" } From cd63116dd4528466f3c80df1e8726d6854449531 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 10 Mar 2014 21:16:07 -0700 Subject: [PATCH 10/47] Bumping manifests a=b2g-bump --- 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/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 3a2266da714a..e09cd65a6baf 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 a8cab587dc16..65c82c287606 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 70a89a3050b2..ae0335864eb0 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 3a2266da714a..e09cd65a6baf 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 901f085c8133..b2dd1fa5d4fe 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 e99ac31da394..2314b64f2798 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 20a62ed5423c..69b90d37e6e8 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 7e57a6e848f9..24d2ac291678 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 858168682fd4..990e14d82fe3 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 537d8ddd32b7..12c53b90d546 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 0a91a0a2c08b40668207bb0b83d350cc019c9172 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 10 Mar 2014 21:35:22 -0700 Subject: [PATCH 11/47] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/ade2ad496f35 Author: Arthur Chen Desc: Merge pull request #17056 from crh0716/975918_1 Bug 975918 - Support DSDS for voice mail r=jaoo, etienne ======== https://hg.mozilla.org/integration/gaia-central/rev/1cf578cedfa3 Author: Arthur Chen Desc: Bug 975918 - Support DSDS for voice mail --- 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 4b18859f5764..bc005c3fa88b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "8bca26da73b461182dc8e8b9177b780dae64ce61", + "revision": "ade2ad496f35096321b97eef4b1544270cbb9334", "repo_path": "/integration/gaia-central" } From f9c6c75bd0ebd4c2d199a938f666bc921dc6509b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 10 Mar 2014 21:46:26 -0700 Subject: [PATCH 12/47] Bumping manifests a=b2g-bump --- 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/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index e09cd65a6baf..7fa22866347d 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 65c82c287606..61482eec2390 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 ae0335864eb0..f56d2c74ae49 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 e09cd65a6baf..7fa22866347d 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index b2dd1fa5d4fe..8fe199d347e5 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 2314b64f2798..fc1d9b538649 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 69b90d37e6e8..68990b136768 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 24d2ac291678..5cd50f356e76 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 990e14d82fe3..fda8189e4a17 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 12c53b90d546..06218f1b57c8 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 26ea20ca40c736d702b6edba17979165339a0744 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 00:10:23 -0700 Subject: [PATCH 13/47] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/290ea329dd2a Author: Timothy Guan-tin Chien Desc: Merge pull request #16684 from timdream/keyboard2-keyboard Bug 975966 - [keyboard refactor] Convert suggestions.js to instantiable pattern, r=rudyl ======== https://hg.mozilla.org/integration/gaia-central/rev/bac24c34837a Author: Timothy Guan-tin Chien Desc: Bug 975966 - [keyboard refactor] Convert suggestions.js to instantiable pattern --- 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 bc005c3fa88b..35fcfa06c931 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "ade2ad496f35096321b97eef4b1544270cbb9334", + "revision": "290ea329dd2a9273673833eaa95c0f9feb53cdc9", "repo_path": "/integration/gaia-central" } From 7bd0f4baec2ce3700f9544be7ec155635dfdc10d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 00:16:06 -0700 Subject: [PATCH 14/47] Bumping manifests a=b2g-bump --- 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/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 7fa22866347d..683acbcfcf6d 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 61482eec2390..7b04399058b8 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 f56d2c74ae49..11a72e5b180c 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 7fa22866347d..683acbcfcf6d 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 8fe199d347e5..0f3329f7d5b0 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 fc1d9b538649..81f35bafa82b 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 68990b136768..55312abcc778 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 5cd50f356e76..6db373d303a1 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index fda8189e4a17..bf48a7d5b783 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 06218f1b57c8..13b7c3b7e007 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 29bd5a77120fefaa42dd917a50f7e3b585db1565 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 00:25:16 -0700 Subject: [PATCH 15/47] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/c59be1a8fe19 Author: Rudy Lu Desc: Merge pull request #17058 from shamenchens/Bug981499-Keyboard-Highlight-master Bug 981499 - The arrow icon of the candidate panel in Asian language input methods is rendered incorrectly ======== https://hg.mozilla.org/integration/gaia-central/rev/5fd1ea0f98f1 Author: Sherman Chen Desc: Bug 981499 - The arrow icon of the candidate panel in Asian language input methods is rendered incorrectly --- 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 35fcfa06c931..283576584eea 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "290ea329dd2a9273673833eaa95c0f9feb53cdc9", + "revision": "c59be1a8fe19b46b97c0eaf1fb71cc7ebb3e59aa", "repo_path": "/integration/gaia-central" } From 60ac38c80d1bf5ebc668afd28da96b0db6ccd5ab Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 00:31:43 -0700 Subject: [PATCH 16/47] Bumping manifests a=b2g-bump --- 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/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 683acbcfcf6d..328aa317b51d 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 7b04399058b8..66c626860b40 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 11a72e5b180c..24a343bcdfb1 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 683acbcfcf6d..328aa317b51d 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 0f3329f7d5b0..45108d89c7e1 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 81f35bafa82b..f6f04b3d0f78 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 55312abcc778..2bf1a3ca36a9 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 6db373d303a1..97e8d72a8cec 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index bf48a7d5b783..183039c107fa 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 13b7c3b7e007..ada0bd164f7c 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 0948a90b7684d6ec2347752be9b930cb93985614 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 02:15:26 -0700 Subject: [PATCH 17/47] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/b0db64aea806 Author: Julien Wajsberg Desc: Merge pull request #16798 from julienw/974733-sending-sms-activity-v2 Bug 974733 - [Sora][Message]The conversation message display wrong after... ======== https://hg.mozilla.org/integration/gaia-central/rev/740ccb66664a Author: Julien Wajsberg Desc: Bug 974733 - [Sora][Message] We should not change panels when handling the "sending" event on the window that does not send the message r=schung When the user presses the "send" button, we set a boolean, so that when we receive the "sending" event, we know whether we're in the same window. --- 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 283576584eea..669ce9039dc4 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "c59be1a8fe19b46b97c0eaf1fb71cc7ebb3e59aa", + "revision": "b0db64aea806304542162be7047ee9063d04dd07", "repo_path": "/integration/gaia-central" } From 6f14d608191b8b9f75a511f8bf5923d0486b863c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 02:16:58 -0700 Subject: [PATCH 18/47] Bumping manifests a=b2g-bump --- 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/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 328aa317b51d..96e0925f4ba4 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 66c626860b40..2a3a39000357 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 24a343bcdfb1..ed77516ce8bc 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 328aa317b51d..96e0925f4ba4 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 45108d89c7e1..ac3760e37f3e 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 f6f04b3d0f78..439557c27cff 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 2bf1a3ca36a9..2d3d385a6ce9 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 97e8d72a8cec..a427626ef5ac 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 183039c107fa..a77e68fbcbd0 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index ada0bd164f7c..fd68b1719f12 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 40d09f14862275d3ed16b45d008615209588ab3d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 02:30:23 -0700 Subject: [PATCH 19/47] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/5dd3c7f701c8 Author: EragonJ Desc: Merge pull request #17062 from EragonJ/bug-981993 Bug 981993 - intermittent fail in improve_settings_test.js ======== https://hg.mozilla.org/integration/gaia-central/rev/0a4711a26b88 Author: EragonJ Desc: Bug 981993 - intermittent fail in improve_settings_test.js --- 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 669ce9039dc4..4e59cbf55559 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "b0db64aea806304542162be7047ee9063d04dd07", + "revision": "5dd3c7f701c8aa805167e13bb90db72d86d6d5b9", "repo_path": "/integration/gaia-central" } From 9a7ca85d21a5416d3867b935f3b67f598d8993a7 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 02:36:03 -0700 Subject: [PATCH 20/47] Bumping manifests a=b2g-bump --- 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/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 96e0925f4ba4..5ad171e6287d 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 2a3a39000357..f43d7296d8fb 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 ed77516ce8bc..df679c1f686c 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 96e0925f4ba4..5ad171e6287d 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index ac3760e37f3e..93e0635c4c17 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 439557c27cff..a37d9d9ddc47 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 2d3d385a6ce9..238a8dcd21b5 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index a427626ef5ac..16a97e804e7c 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index a77e68fbcbd0..6356b54877c6 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index fd68b1719f12..1ba4566476d2 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From e2fb089746a34392af09e36f2f1eea4cfdf5ad9f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 04:00:33 -0700 Subject: [PATCH 21/47] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/ce29ee9e45ba Author: Kevin Grandon Desc: Revert "Bug 971497 - [System2] Instantiable HomeGesture r=alive" This reverts commit aca50fb3c70966b5f0ec1e808a0174eb34fe83ac. ======== https://hg.mozilla.org/integration/gaia-central/rev/7accebf88df3 Author: Kevin Grandon Desc: Merge pull request #17005 from KevinGrandon/bug_971497_system2_home_gesture Bug 971497 - [System2] Instantiable HomeGesture r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/b2e3f17e79d1 Author: Kevin Grandon Desc: Bug 971497 - [System2] Instantiable HomeGesture r=alive --- 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 4e59cbf55559..9ee576260b53 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "5dd3c7f701c8aa805167e13bb90db72d86d6d5b9", + "revision": "ce29ee9e45ba88a7963d003d382a931324e7da96", "repo_path": "/integration/gaia-central" } From d1973e30613cfb8ae6695e7f581f17a1a8514539 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 04:06:10 -0700 Subject: [PATCH 22/47] Bumping manifests a=b2g-bump --- 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/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 5ad171e6287d..ec1e474370ee 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 f43d7296d8fb..d54b65b7b544 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 df679c1f686c..137e2279744f 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 5ad171e6287d..ec1e474370ee 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 93e0635c4c17..a3304fdc926c 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 a37d9d9ddc47..83ed1b6de5e3 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 238a8dcd21b5..d3e674185479 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 16a97e804e7c..1f34e38052a7 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 6356b54877c6..18161d1d019d 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 1ba4566476d2..42bf7008033a 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 8c2c4a3012d650ee1e36bd36d9ed2f02dcb4f11c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 04:10:23 -0700 Subject: [PATCH 23/47] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/7319f9447565 Author: vingtetun <21@vingtetun.org> Desc: Merge pull request #17007 from vingtetun/bug981440 Bug 981440 - Add a CSS linter to the build system. r=ochameau ======== https://hg.mozilla.org/integration/gaia-central/rev/0d2cd9e2d98c Author: Vivien Nicolas <21@vingtetun.org> Desc: Bug 981440 - Add a CSS linter to the build system. r=ochameau --- 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 9ee576260b53..56422332ad34 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "ce29ee9e45ba88a7963d003d382a931324e7da96", + "revision": "7319f9447565e768790bd77b313327b982717da2", "repo_path": "/integration/gaia-central" } From 0c0a0a4b940a3904d9edf01e3997b34e70615499 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 04:16:23 -0700 Subject: [PATCH 24/47] Bumping manifests a=b2g-bump --- 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/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index ec1e474370ee..30d6d8f23b2c 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 d54b65b7b544..b1273a86fb4e 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 137e2279744f..8400883746ba 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 ec1e474370ee..30d6d8f23b2c 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index a3304fdc926c..81b30596e764 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 83ed1b6de5e3..f4393ff54224 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index d3e674185479..f34d86504763 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 1f34e38052a7..0f3e864fbd3a 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 18161d1d019d..929f2fc0d1ea 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 42bf7008033a..046c5b8ef033 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 6714a2f6e572456d77749933ab52d8dd924a09be Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 05:50:23 -0700 Subject: [PATCH 25/47] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/2b8576720f96 Author: Ryan VanderMeulen Desc: Merge pull request #17038 from flodolo/bug975637_ftuselection Bug 980456 - [B2G][FTE][Date & Time] Continent and city selections aren't displayed highlighted ======== https://hg.mozilla.org/integration/gaia-central/rev/4133291d60c4 Author: Francesco Lodolo (:flod) Desc: Bug 980456 - [B2G][FTE][Date & Time] Continent and city selections aren't displayed highlighted ======== https://hg.mozilla.org/integration/gaia-central/rev/e9696b59fbae Author: Ryan VanderMeulen Desc: Merge pull request #17014 from flodolo/bug942573_feedbackstring Bug 942573 - [Settings] Feedback: improve "Thank you" message ======== https://hg.mozilla.org/integration/gaia-central/rev/eb19597cd07c Author: Francesco Lodolo (:flod) Desc: Bug 942573 - [Settings] Feedback: improve wording when feedback is complete Updated string from :matej --- 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 56422332ad34..5cfa76a38f70 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "7319f9447565e768790bd77b313327b982717da2", + "revision": "2b8576720f964e388538837967c4448aa615845e", "repo_path": "/integration/gaia-central" } From 19b2f6f2bc6f586ca6d897522a3dd6b35674f0d6 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 05:51:46 -0700 Subject: [PATCH 26/47] Bumping manifests a=b2g-bump --- 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/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 30d6d8f23b2c..4b39ccaa2ad0 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 b1273a86fb4e..19124e67160a 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 8400883746ba..8e8a8413fb39 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 30d6d8f23b2c..4b39ccaa2ad0 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 81b30596e764..8b10403cc13b 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 f4393ff54224..2b0b53dd0a5f 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index f34d86504763..79822f30b652 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 0f3e864fbd3a..e77c2e61b09a 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 929f2fc0d1ea..b25dd4b9fa8a 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 046c5b8ef033..c7efd4f792ff 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From b2af1d66a49196a3a0d30671d2a76a9b58d24926 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 06:15:27 -0700 Subject: [PATCH 27/47] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/5e4fffbaee8e Author: Zac Desc: Merge pull request #16701 from zacc/bug_977046 Bug 977046 - On device testing, cleanup cache and local webapps between ... ======== https://hg.mozilla.org/integration/gaia-central/rev/bddcb4867d40 Author: Zac Campbell Desc: Bug 977046 - On device testing, cleanup cache and local webapps between b2g restart --- 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 5cfa76a38f70..8b606d01cdf6 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "2b8576720f964e388538837967c4448aa615845e", + "revision": "5e4fffbaee8e4dc29053510b650b4b20b1a96998", "repo_path": "/integration/gaia-central" } From 409296245f10f1dc4a7743d8b94639db508dc2f3 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 06:21:04 -0700 Subject: [PATCH 28/47] Bumping manifests a=b2g-bump --- 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/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 4b39ccaa2ad0..0ca1162513de 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 19124e67160a..6e0fabc4e52f 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 8e8a8413fb39..a392b58ed0bc 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 4b39ccaa2ad0..0ca1162513de 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 8b10403cc13b..4f52c712ab19 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 2b0b53dd0a5f..a531c4e4691d 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 79822f30b652..c00342dc2994 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index e77c2e61b09a..666f7eb1cbbd 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index b25dd4b9fa8a..215c8ae1cbc8 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index c7efd4f792ff..2a333d34b51c 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 4ea781fe12f931b4eb698f4eaa48592dad10fabc Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 06:40:25 -0700 Subject: [PATCH 29/47] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/7086fc75af7c Author: Ben Kelly Desc: Revert "Merge pull request #15774 from wanderview/opus-json" This reverts commit 6f968274d05ba8cf30b8b9c45b50b3f2ca220af7, reversing changes made to 09ae464cb04f056aaf8272636a9d4f51f5f9a395. Conflicts: apps/communications/ftu/test/unit/resources/customization.json --- 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 8b606d01cdf6..07162f4892b1 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "5e4fffbaee8e4dc29053510b650b4b20b1a96998", + "revision": "7086fc75af7c9622ade59a42308f50673fdc4c22", "repo_path": "/integration/gaia-central" } From a8bbd0e32f841bd8e98a0ebc75b6586c3adf4a87 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 06:46:13 -0700 Subject: [PATCH 30/47] Bumping manifests a=b2g-bump --- 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/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 0ca1162513de..c5290097cb1a 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 6e0fabc4e52f..6f47d5040376 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 a392b58ed0bc..885611425b41 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 0ca1162513de..c5290097cb1a 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 4f52c712ab19..f922729ecfec 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 a531c4e4691d..db8bbb6acbc6 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index c00342dc2994..a1dcf080c84d 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 666f7eb1cbbd..9435229b8280 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 215c8ae1cbc8..d2eeeb31e8c2 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 2a333d34b51c..f61c5a026a17 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 2dbabf42ff6ace58f5f4d47ac3f7d949b27b06fe Mon Sep 17 00:00:00 2001 From: Andrew Halberstadt Date: Tue, 11 Mar 2014 10:08:25 -0400 Subject: [PATCH 31/47] Bug 932362 - Create mach target for running b2g xpcshell tests, r=jgriffin --- testing/xpcshell/mach_commands.py | 105 ++++++++++++++++++++++++++++++ testing/xpcshell/runtestsb2g.py | 9 ++- 2 files changed, 111 insertions(+), 3 deletions(-) diff --git a/testing/xpcshell/mach_commands.py b/testing/xpcshell/mach_commands.py index 0ebc0105f200..0d56f615faf8 100644 --- a/testing/xpcshell/mach_commands.py +++ b/testing/xpcshell/mach_commands.py @@ -11,6 +11,7 @@ import logging import os import shutil import sys +import urllib2 from StringIO import StringIO @@ -26,6 +27,15 @@ from mach.decorators import ( Command, ) +ADB_NOT_FOUND = ''' +The %s command requires the adb binary to be on your path. + +If you have a B2G build, this can be found in +'%s/out/host//bin'. +'''.lstrip() + +BUSYBOX_URL = 'http://www.busybox.net/downloads/binaries/latest/busybox-armv7l' + if sys.version_info[0] < 3: unicode_type = unicode @@ -274,9 +284,99 @@ class AndroidXPCShellRunner(MozbuildObject): return int(not result) +class B2GXPCShellRunner(MozbuildObject): + def __init__(self, *args, **kwargs): + MozbuildObject.__init__(self, *args, **kwargs) + + # TODO Bug 794506 remove once mach integrates with virtualenv. + build_path = os.path.join(self.topobjdir, 'build') + if build_path not in sys.path: + sys.path.append(build_path) + + build_path = os.path.join(self.topsrcdir, 'build') + if build_path not in sys.path: + sys.path.append(build_path) + + self.tests_dir = os.path.join(self.topobjdir, '_tests') + self.xpcshell_dir = os.path.join(self.tests_dir, 'xpcshell') + self.bin_dir = os.path.join(self.distdir, 'bin') + + def _download_busybox(self, b2g_home): + system_bin = os.path.join(b2g_home, 'out', 'target', 'product', 'generic', 'system', 'bin') + busybox_path = os.path.join(system_bin, 'busybox') + + if os.path.isfile(busybox_path): + return busybox_path + + if not os.path.isdir(system_bin): + os.makedirs(system_bin) + + try: + data = urllib2.urlopen(BUSYBOX_URL) + except urllib2.URLError: + print('There was a problem downloading busybox. Proceeding without it,' \ + 'initial setup will be slow.') + return + + with open(busybox_path, 'wb') as f: + f.write(data.read()) + return busybox_path + + def run_test(self, test_file, b2g_home=None, busybox=None, + # ignore parameters from other platforms' options + **kwargs): + try: + import which + which.which('adb') + except which.WhichError: + # TODO Find adb automatically if it isn't on the path + print(ADB_NOT_FOUND % ('mochitest-remote', b2g_home)) + sys.exit(1) + + test_path = None + if test_file: + test_path = self._wrap_path_argument(test_file).relpath() + + import runtestsb2g + parser = runtestsb2g.B2GOptions() + options, args = parser.parse_args([]) + + options.b2g_path = b2g_home + options.busybox = busybox or os.environ.get('BUSYBOX') + options.emulator = 'arm' + options.localLib = self.bin_dir + options.localBin = self.bin_dir + options.logcat_dir = self.xpcshell_dir + options.manifest = os.path.join(self.xpcshell_dir, 'xpcshell_b2g.ini') + options.mozInfo = os.path.join(self.topobjdir, 'mozinfo.json') + options.objdir = self.topobjdir + options.symbolsPath = os.path.join(self.distdir, 'crashreporter-symbols'), + options.testingModulesDir = os.path.join(self.tests_dir, 'modules') + options.testsRootDir = self.xpcshell_dir + options.testPath = test_path + options.use_device_libs = True + + if not options.busybox: + options.busybox = self._download_busybox(b2g_home) + + return runtestsb2g.run_remote_xpcshell(parser, options, args) + +def is_platform_supported(cls): + """Must have a Firefox, Android or B2G build.""" + return conditions.is_android(cls) or \ + conditions.is_b2g(cls) or \ + conditions.is_firefox(cls) + @CommandProvider class MachCommands(MachCommandBase): + def __init__(self, context): + MachCommandBase.__init__(self, context) + + for attr in ('b2g_home', 'device_name'): + setattr(self, attr, getattr(context, attr, None)) + @Command('xpcshell-test', category='testing', + conditions=[is_platform_supported], description='Run XPCOM Shell tests.') @CommandArgument('test_file', default='all', nargs='?', metavar='TEST', help='Test to run. Can be specified as a single JS file, a directory, ' @@ -313,6 +413,8 @@ class MachCommands(MachCommandBase): help='(Android) Do not copy files to device') @CommandArgument('--local-apk', type=str, default=None, help='(Android) Use specified Fennec APK') + @CommandArgument('--busybox', type=str, default=None, + help='(B2G) Path to busybox binary (speeds up installation of tests).') def run_xpcshell_test(self, **params): from mozbuild.controller.building import BuildDriver @@ -326,6 +428,9 @@ class MachCommands(MachCommandBase): if conditions.is_android(self): xpcshell = self._spawn(AndroidXPCShellRunner) + elif conditions.is_b2g(self): + xpcshell = self._spawn(B2GXPCShellRunner) + params['b2g_home'] = self.b2g_home else: xpcshell = self._spawn(XPCShellRunner) xpcshell.cwd = self._mach_context.cwd diff --git a/testing/xpcshell/runtestsb2g.py b/testing/xpcshell/runtestsb2g.py index 55e417b70b02..872982d3ae7c 100644 --- a/testing/xpcshell/runtestsb2g.py +++ b/testing/xpcshell/runtestsb2g.py @@ -153,9 +153,7 @@ class B2GOptions(RemoteXPCShellOptions): self.error("You must specify --emulator if you specify --logcat-dir") return RemoteXPCShellOptions.verifyRemoteOptions(self, options) -def main(): - parser = B2GOptions() - options, args = parser.parse_args() +def run_remote_xpcshell(parser, options, args): options = parser.verifyRemoteOptions(options) # Create the Marionette instance @@ -212,6 +210,11 @@ def main(): traceback.print_exc() sys.exit(1) +def main(): + parser = B2GOptions() + options, args = parser.parse_args() + + run_remote_xpcshell(parser, options, args) # You usually run this like : # python runtestsb2g.py --emulator arm --b2gpath $B2GPATH --manifest $MANIFEST [--xre-path $MOZ_HOST_BIN From 931a92e01381cf6cedb12dd8132b747b765d7ba6 Mon Sep 17 00:00:00 2001 From: Vicamo Yang Date: Tue, 11 Mar 2014 22:17:57 +0800 Subject: [PATCH 32/47] Bug 957917 - 1/2: B2G RIL - read PDP type from APN settings. r=hsinyi --- dom/system/gonk/RadioInterfaceLayer.js | 19 ++++++++++++++++++- dom/system/gonk/ril_consts.js | 9 +++++++++ dom/system/gonk/ril_worker.js | 5 +++-- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js index b09a0a64533e..5150c22304c0 100644 --- a/dom/system/gonk/RadioInterfaceLayer.js +++ b/dom/system/gonk/RadioInterfaceLayer.js @@ -52,6 +52,10 @@ let RILQUIRKS_DATA_REGISTRATION_ON_DEMAND = let RILQUIRKS_RADIO_OFF_WO_CARD = libcutils.property_get("ro.moz.ril.radio_off_wo_card", "false") == "true"; +// Ril quirk to enable IPv6 protocol/roaming protocol in APN settings. +let RILQUIRKS_HAVE_IPV6 = + libcutils.property_get("ro.moz.ril.ipv6", "false") == "true"; + const RADIOINTERFACELAYER_CID = Components.ID("{2d831c8d-6017-435b-a80c-e5d422810cea}"); const RADIOINTERFACE_CID = @@ -4525,12 +4529,25 @@ RILNetworkInterface.prototype = { } authType = RIL.RIL_DATACALL_AUTH_TO_GECKO.indexOf(RIL.GECKO_DATACALL_AUTH_DEFAULT); } + let pdpType = RIL.GECKO_DATACALL_PDP_TYPE_IP; + if (RILQUIRKS_HAVE_IPV6) { + pdpType = !radioInterface.rilContext.data.roaming + ? this.apnSetting.protocol + : this.apnSetting.roaming_protocol; + if (RIL.RIL_DATACALL_PDP_TYPES.indexOf(pdpType) < 0) { + if (DEBUG) { + this.debug("Invalid pdpType '" + pdpType + "', using '" + + RIL.GECKO_DATACALL_PDP_TYPE_DEFAULT + "'"); + } + pdpType = RIL.GECKO_DATACALL_PDP_TYPE_DEFAULT; + } + } radioInterface.setupDataCall(radioTechnology, this.apnSetting.apn, this.apnSetting.user, this.apnSetting.password, authType, - "IP"); + pdpType); this.connecting = true; }, diff --git a/dom/system/gonk/ril_consts.js b/dom/system/gonk/ril_consts.js index 81b44114a05b..f0d070ed2ce6 100644 --- a/dom/system/gonk/ril_consts.js +++ b/dom/system/gonk/ril_consts.js @@ -2361,6 +2361,15 @@ this.RIL_DATACALL_AUTH_TO_GECKO = [ GECKO_DATACALL_AUTH_PAP_OR_CHAP // DATACALL_AUTH_PAP_OR_CHAP ]; +this.GECKO_DATACALL_PDP_TYPE_IP = "IP"; +this.GECKO_DATACALL_PDP_TYPE_IPV6 = "IPV6"; +this.GECKO_DATACALL_PDP_TYPE_DEFAULT = GECKO_DATACALL_PDP_TYPE_IP; +this.RIL_DATACALL_PDP_TYPES = [ + GECKO_DATACALL_PDP_TYPE_IP, + GECKO_DATACALL_PDP_TYPE_IPV6, + // TODO: Bug 978711 - Support IPV4V6 +]; + this.DATACALL_PROFILE_DEFAULT = 0; this.DATACALL_PROFILE_TETHERED = 1; this.DATACALL_PROFILE_OEM_BASE = 1000; diff --git a/dom/system/gonk/ril_worker.js b/dom/system/gonk/ril_worker.js index 94024ef52fdc..cbe07ee855e3 100644 --- a/dom/system/gonk/ril_worker.js +++ b/dom/system/gonk/ril_worker.js @@ -3962,8 +3962,9 @@ RilObject.prototype = { } currentDataCall.gw = updatedDataCall.gw; if (updatedDataCall.dns) { - currentDataCall.dns[0] = updatedDataCall.dns[0]; - currentDataCall.dns[1] = updatedDataCall.dns[1]; + currentDataCall.dns = updatedDataCall.dns.slice(); + } else { + currentDataCall.dns = []; } currentDataCall.rilMessageType = "datacallstatechange"; this.sendChromeMessage(currentDataCall); From e02ccd0835246110c63a80d422238145737ba013 Mon Sep 17 00:00:00 2001 From: Vicamo Yang Date: Tue, 11 Mar 2014 22:18:00 +0800 Subject: [PATCH 33/47] Bug 957917 - 2/2: test cases. r=hsinyi --- dom/bluetooth/tests/marionette/head.js | 43 +- dom/mobileconnection/tests/marionette/head.js | 399 ++++++++++++++++++ .../tests/marionette/manifest.ini | 2 + .../tests/marionette/test_mobile_data_ipv6.js | 112 +++++ dom/mobilemessage/tests/marionette/head.js | 74 +++- 5 files changed, 594 insertions(+), 36 deletions(-) create mode 100644 dom/mobileconnection/tests/marionette/head.js create mode 100644 dom/mobileconnection/tests/marionette/test_mobile_data_ipv6.js diff --git a/dom/bluetooth/tests/marionette/head.js b/dom/bluetooth/tests/marionette/head.js index 2cbb53f97ec1..cb63a9e8df9e 100644 --- a/dom/bluetooth/tests/marionette/head.js +++ b/dom/bluetooth/tests/marionette/head.js @@ -9,12 +9,13 @@ let Promise = let bluetoothManager; -/* Get mozSettings value specified by @aKey. +/** + * Get mozSettings value specified by @aKey. * * Resolve if that mozSettings value is retrieved successfully, reject * otherwise. * - * Forfill params: + * Fulfill params: * The corresponding mozSettings value of the key. * Reject params: (none) * @@ -39,11 +40,12 @@ function getSettings(aKey) { return deferred.promise; } -/* Set mozSettings values. +/** + * Set mozSettings values. * * Resolve if that mozSettings value is set successfully, reject otherwise. * - * Forfill params: (none) + * Fulfill params: (none) * Reject params: (none) * * @param aSettings @@ -67,12 +69,13 @@ function setSettings(aSettings) { return deferred.promise; } -/* Get mozSettings value of 'bluetooth.enabled'. +/** + * Get mozSettings value of 'bluetooth.enabled'. * * Resolve if that mozSettings value is retrieved successfully, reject * otherwise. * - * Forfill params: + * Fulfill params: * A boolean value. * Reject params: (none) * @@ -82,11 +85,12 @@ function getBluetoothEnabled() { return getSettings("bluetooth.enabled"); } -/* Set mozSettings value of 'bluetooth.enabled'. +/** + * Set mozSettings value of 'bluetooth.enabled'. * * Resolve if that mozSettings value is set successfully, reject otherwise. * - * Forfill params: (none) + * Fulfill params: (none) * Reject params: (none) * * @param aEnabled @@ -100,10 +104,11 @@ function setBluetoothEnabled(aEnabled) { return setSettings(obj); } -/* Push required permissions and test if |navigator.mozBluetooth| exists. +/** + * Push required permissions and test if |navigator.mozBluetooth| exists. * Resolve if it does, reject otherwise. * - * Forfill params: + * Fulfill params: * bluetoothManager -- an reference to navigator.mozBluetooth. * Reject params: (none) * @@ -151,11 +156,12 @@ function ensureBluetoothManager(aPermissions) { return deferred.promise; } -/* Wait for one named BluetoothManager event. +/** + * Wait for one named BluetoothManager event. * * Resolve if that named event occurs. Never reject. * - * Forfill params: the DOMEvent passed. + * Fulfill params: the DOMEvent passed. * * @return A deferred promise. */ @@ -172,12 +178,13 @@ function waitForManagerEvent(aEventName) { return deferred.promise; } -/* Convenient function for setBluetoothEnabled and waitForManagerEvent +/** + * Convenient function for setBluetoothEnabled and waitForManagerEvent * combined. * * Resolve if that named event occurs. Reject if we can't set settings. * - * Forfill params: the DOMEvent passed. + * Fulfill params: the DOMEvent passed. * Reject params: (none) * * @return A deferred promise. @@ -198,11 +205,12 @@ function setBluetoothEnabledAndWait(aEnabled) { return Promise.all(promises); } -/* Get default adapter. +/** + * Get default adapter. * * Resolve if that default adapter is got, reject otherwise. * - * Forfill params: a BluetoothAdapter instance. + * Fulfill params: a BluetoothAdapter instance. * Reject params: a DOMError, or null if if there is no adapter ready yet. * * @return A deferred promise. @@ -237,7 +245,8 @@ function getDefaultAdapter() { return deferred.promise; } -/* Flush permission settings and call |finish()|. +/** + * Flush permission settings and call |finish()|. */ function cleanUp() { SpecialPowers.flushPermissions(function() { diff --git a/dom/mobileconnection/tests/marionette/head.js b/dom/mobileconnection/tests/marionette/head.js new file mode 100644 index 000000000000..623d8047903a --- /dev/null +++ b/dom/mobileconnection/tests/marionette/head.js @@ -0,0 +1,399 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +const {Cc: Cc, Ci: Ci, Cr: Cr, Cu: Cu} = SpecialPowers; + +const SETTINGS_KEY_DATA_ENABLED = "ril.data.enabled"; +const SETTINGS_KEY_DATA_ROAMING_ENABLED = "ril.data.roaming_enabled"; +const SETTINGS_KEY_DATA_APN_SETTINGS = "ril.data.apnSettings"; + +let Promise = Cu.import("resource://gre/modules/Promise.jsm").Promise; + +let _pendingEmulatorCmdCount = 0; + +/** + * Send emulator command with safe guard. + * + * We should only call |finish()| after all emulator command transactions + * end, so here comes with the pending counter. Resolve when the emulator + * gives positive response, and reject otherwise. + * + * Fulfill params: + * result -- an array of emulator response lines. + * Reject params: + * result -- an array of emulator response lines. + * + * @param aCommand + * A string command to be passed to emulator through its telnet console. + * + * @return A deferred promise. + */ +function runEmulatorCmdSafe(aCommand) { + let deferred = Promise.defer(); + + ++_pendingEmulatorCmdCount; + runEmulatorCmd(aCommand, function(aResult) { + --_pendingEmulatorCmdCount; + + ok(true, "Emulator response: " + JSON.stringify(aResult)); + if (Array.isArray(aResult) && aResult[0] === "OK") { + deferred.resolve(aResult); + } else { + deferred.reject(aResult); + } + }); + + return deferred.promise; +} + +/** + * Get mozSettings value specified by @aKey. + * + * Resolve if that mozSettings value is retrieved successfully, reject + * otherwise. + * + * Fulfill params: + * The corresponding mozSettings value of the key. + * Reject params: (none) + * + * @param aKey + * A string. + * @param aAllowError [optional] + * A boolean value. If set to true, an error response won't be treated + * as test failure. Default: false. + * + * @return A deferred promise. + */ +function getSettings(aKey, aAllowError) { + let deferred = Promise.defer(); + + let request = navigator.mozSettings.createLock().get(aKey); + request.addEventListener("success", function(aEvent) { + ok(true, "getSettings(" + aKey + ") - success"); + deferred.resolve(aEvent.target.result[aKey]); + }); + request.addEventListener("error", function() { + ok(aAllowError, "getSettings(" + aKey + ") - error"); + deferred.reject(); + }); + + return deferred.promise; +} + +/** + * Set mozSettings values. + * + * Resolve if that mozSettings value is set successfully, reject otherwise. + * + * Fulfill params: (none) + * Reject params: (none) + * + * @param aSettings + * An object of format |{key1: value1, key2: value2, ...}|. + * @param aAllowError [optional] + * A boolean value. If set to true, an error response won't be treated + * as test failure. Default: false. + * + * @return A deferred promise. + */ +function setSettings(aSettings, aAllowError) { + let deferred = Promise.defer(); + + let request = navigator.mozSettings.createLock().set(aSettings); + request.addEventListener("success", function() { + ok(true, "setSettings(" + JSON.stringify(aSettings) + ")"); + deferred.resolve(); + }); + request.addEventListener("error", function() { + ok(aAllowError, "setSettings(" + JSON.stringify(aSettings) + ")"); + deferred.reject(); + }); + + return deferred.promise; +} + +/** + * Set mozSettings value with only one key. + * + * Resolve if that mozSettings value is set successfully, reject otherwise. + * + * Fulfill params: (none) + * Reject params: (none) + * + * @param aKey + * A string key. + * @param aValue + * An object value. + * @param aAllowError [optional] + * A boolean value. If set to true, an error response won't be treated + * as test failure. Default: false. + * + * @return A deferred promise. + */ +function setSettings1(aKey, aValue, aAllowError) { + let settings = {}; + settings[aKey] = aValue; + return setSettings(settings, aAllowError); +} + +/** + * Convenient MozSettings getter for SETTINGS_KEY_DATA_ENABLED. + */ +function getDataEnabled(aAllowError) { + return getSettings(SETTINGS_KEY_DATA_ENABLED, aAllowError); +} + +/** + * Convenient MozSettings setter for SETTINGS_KEY_DATA_ENABLED. + */ +function setDataEnabled(aEnabled, aAllowError) { + return setSettings1(SETTINGS_KEY_DATA_ENABLED, aEnabled, aAllowError); +} + +/** + * Convenient MozSettings getter for SETTINGS_KEY_DATA_ROAMING_ENABLED. + */ +function getDataRoamingEnabled(aAllowError) { + return getSettings(SETTINGS_KEY_DATA_ROAMING_ENABLED, aAllowError); +} + +/** + * Convenient MozSettings setter for SETTINGS_KEY_DATA_ROAMING_ENABLED. + */ +function setDataRoamingEnabled(aEnabled, aAllowError) { + return setSettings1(SETTINGS_KEY_DATA_ROAMING_ENABLED, aEnabled, aAllowError); +} + +/** + * Convenient MozSettings getter for SETTINGS_KEY_DATA_APN_SETTINGS. + */ +function getDataApnSettings(aAllowError) { + return getSettings(SETTINGS_KEY_DATA_APN_SETTINGS, aAllowError); +} + +/** + * Convenient MozSettings setter for SETTINGS_KEY_DATA_APN_SETTINGS. + */ +function setDataApnSettings(aApnSettings, aAllowError) { + return setSettings1(SETTINGS_KEY_DATA_APN_SETTINGS, aApnSettings, aAllowError); +} + +let mobileConnection; + +/** + * Push required permissions and test if + * |navigator.mozMobileConnections[]| exists. Resolve if it does, + * reject otherwise. + * + * Fulfill params: + * mobileConnection -- an reference to navigator.mozMobileMessage. + * + * Reject params: (none) + * + * @param aAdditonalPermissions [optional] + * An array of permission strings other than "mobileconnection" to be + * pushed. Default: empty string. + * @param aServiceId [optional] + * A numeric DSDS service id. Default: 0. + * + * @return A deferred promise. + */ +function ensureMobileConnection(aAdditionalPermissions, aServiceId) { + let deferred = Promise.defer(); + + aAdditionalPermissions = aAdditionalPermissions || []; + aServiceId = aServiceId || 0; + + if (aAdditionalPermissions.indexOf("mobileconnection") < 0) { + aAdditionalPermissions.push("mobileconnection"); + } + let permissions = []; + for (let perm of aAdditionalPermissions) { + permissions.push({ "type": perm, "allow": 1, "context": document }); + } + + SpecialPowers.pushPermissions(permissions, function() { + ok(true, "permissions pushed: " + JSON.stringify(permissions)); + + // Permission changes can't change existing Navigator.prototype + // objects, so grab our objects from a new Navigator. + let ifr = document.createElement("iframe"); + ifr.addEventListener("load", function load() { + ifr.removeEventListener("load", load); + + mobileConnection = + ifr.contentWindow.navigator.mozMobileConnections[aServiceId]; + + if (mobileConnection) { + log("navigator.mozMobileConnections[" + aServiceId + "] is instance of " + + mobileConnection.constructor); + } else { + log("navigator.mozMobileConnections[" + aServiceId + "] is undefined"); + } + + if (mobileConnection instanceof MozMobileConnection) { + deferred.resolve(mobileConnection); + } else { + deferred.reject(); + } + }); + + document.body.appendChild(ifr); + }); + + return deferred.promise; +} + +/** + * Wait for one named MobileConnection event. + * + * Resolve if that named event occurs. Never reject. + * + * Fulfill params: the DOMEvent passed. + * + * @param aEventName + * A string event name. + * + * @return A deferred promise. + */ +function waitForManagerEvent(aEventName) { + let deferred = Promise.defer(); + + mobileConnection.addEventListener(aEventName, function onevent(aEvent) { + mobileConnection.removeEventListener(aEventName, onevent); + + ok(true, "MobileConnection event '" + aEventName + "' got."); + deferred.resolve(aEvent); + }); + + return deferred.promise; +} + +/** + * Set data connection enabling state and wait for "datachange" event. + * + * Resolve if data connection state changed to the expected one. Never reject. + * + * Fulfill params: (none) + * + * @param aEnabled + * A boolean state. + * + * @return A deferred promise. + */ +function setDataEnabledAndWait(aEnabled) { + let deferred = Promise.defer(); + + let promises = []; + promises.push(waitForManagerEvent("datachange")); + promises.push(setDataEnabled(aEnabled)); + Promise.all(promises).then(function keepWaiting() { + // To ignore some transient states, we only resolve that deferred promise + // when the |connected| state equals to the expected one and never rejects. + let connected = mobileConnection.data.connected; + if (connected == aEnabled) { + deferred.resolve(); + return; + } + + return waitForManagerEvent("datachange").then(keepWaiting); + }); + + return deferred.promise; +} + +/** + * Set voice/data roaming emulation and wait for state change. + * + * Fulfill params: (none) + * + * @param aRoaming + * A boolean state. + * + * @return A deferred promise. + */ +function setEmulatorRoamingAndWait(aRoaming) { + function doSetAndWait(aWhich, aRoaming) { + let promises = []; + promises.push(waitForManagerEvent(aWhich + "change")); + + let cmd = "gsm " + aWhich + " " + (aRoaming ? "roaming" : "home"); + promises.push(runEmulatorCmdSafe(cmd)); + return Promise.all(promises) + .then(() => is(mobileConnection[aWhich].roaming, aRoaming, + aWhich + ".roaming")); + } + + // Set voice registration state first and then data registration state. + return doSetAndWait("voice", aRoaming) + .then(() => doSetAndWait("data", aRoaming)); +} + +let _networkManager; + +/** + * Get internal NetworkManager service. + */ +function getNetworkManager() { + if (!_networkManager) { + _networkManager = Cc["@mozilla.org/network/manager;1"] + .getService(Ci.nsINetworkManager); + ok(_networkManager, "NetworkManager"); + } + + return _networkManager; +} + +/** + * Flush permission settings and call |finish()|. + */ +function cleanUp() { + waitFor(function() { + SpecialPowers.flushPermissions(function() { + // Use ok here so that we have at least one test run. + ok(true, "permissions flushed"); + + finish(); + }); + }, function() { + return _pendingEmulatorCmdCount === 0; + }); +} + +/** + * Basic test routine helper for mobile connection tests. + * + * This helper does nothing but clean-ups. + * + * @param aTestCaseMain + * A function that takes no parameter. + */ +function startTestBase(aTestCaseMain) { + Promise.resolve() + .then(aTestCaseMain) + .then(cleanUp, function() { + ok(false, 'promise rejects during test.'); + cleanUp(); + }); +} + +/** + * Common test routine helper for mobile connection tests. + * + * This function ensures global |mobileConnection| variable is available during + * the process and performs clean-ups as well. + * + * @param aTestCaseMain + * A function that takes one parameter -- mobileConnection. + * @param aAdditonalPermissions [optional] + * An array of permission strings other than "mobileconnection" to be + * pushed. Default: empty string. + * @param aServiceId [optional] + * A numeric DSDS service id. Default: 0. + */ +function startTestCommon(aTestCaseMain, aAdditionalPermissions, aServiceId) { + startTestBase(function() { + return ensureMobileConnection(aAdditionalPermissions, aServiceId) + .then(aTestCaseMain); + }); +} diff --git a/dom/mobileconnection/tests/marionette/manifest.ini b/dom/mobileconnection/tests/marionette/manifest.ini index 88134a44c139..07ad02777d69 100644 --- a/dom/mobileconnection/tests/marionette/manifest.ini +++ b/dom/mobileconnection/tests/marionette/manifest.ini @@ -23,3 +23,5 @@ disabled = Bug 808783 [test_mobile_last_known_network.js] [test_mobile_icc_change.js] [test_mobile_connections_array_uninitialized.js] +[test_mobile_data_ipv6.js] +disabled = Bug 978071 diff --git a/dom/mobileconnection/tests/marionette/test_mobile_data_ipv6.js b/dom/mobileconnection/tests/marionette/test_mobile_data_ipv6.js new file mode 100644 index 000000000000..bf83dfa48c50 --- /dev/null +++ b/dom/mobileconnection/tests/marionette/test_mobile_data_ipv6.js @@ -0,0 +1,112 @@ +/* Any copyright is dedicated to the Public Domain. + http://creativecommons.org/publicdomain/zero/1.0/ */ + +MARIONETTE_TIMEOUT = 60000; +MARIONETTE_HEAD_JS = "head.js"; + +/** + * Test resulting IP address format with given APN settings. + * + * This test utility function performs following steps: + * + * 1) set "ril.data.apnSettings" to a given settings object, + * 2) enable data connection and wait for a "datachange" event, + * 3) check the IP address type of the active network interface, + * 4) disable data connection. + * + * Fulfill params: (none) + * Reject params: (none) + * + * @param aApnSettings + * An APN settings value. + * @param aIsIPv6 + * A boolean value indicating whether we're expecting an IPv6 address. + * + * @return A deferred promise. + */ +function doTest(aApnSettings, aIsIPv6) { + return setDataApnSettings([]) + .then(() => setDataApnSettings(aApnSettings)) + .then(() => setDataEnabledAndWait(true)) + .then(function() { + let nm = getNetworkManager(); + let active = nm.active; + ok(active, "Active network interface"); + + log(" Interface: " + active.name); + log(" Address: " + active.ip); + if (aIsIPv6) { + ok(active.ip.indexOf(":") > 0, "IPv6 address"); + } else { + ok(active.ip.indexOf(":") < 0, "IPv4 address"); + } + }) + .then(() => setDataEnabledAndWait(false)); +} + +function doTestHome(aApnSettings, aProtocol) { + log("Testing \"" + aProtocol + "\"@HOME... "); + + // aApnSettings is a double-array of per PDP context settings. The first + // index is a DSDS service ID, and the second one is the index of pre-defined + // PDP context settings of a specified radio interface. We use 0 for both as + // default here. + aApnSettings[0][0].protocol = aProtocol; + delete aApnSettings[0][0].roaming_protocol; + + return doTest(aApnSettings, aProtocol === "IPV6"); +} + +function doTestRoaming(aApnSettings, aRoaminProtocol) { + log("Testing \"" + aRoaminProtocol + "\"@ROMAING... "); + + // aApnSettings is a double-array of per PDP context settings. The first + // index is a DSDS service ID, and the second one is the index of pre-defined + // PDP context settings of a specified radio interface. We use 0 for both as + // default here. + delete aApnSettings[0][0].protocol; + aApnSettings[0][0].roaming_protocol = aRoaminProtocol; + + return doTest(aApnSettings, aRoaminProtocol === "IPV6"); +} + +startTestCommon(function() { + let origApnSettings; + + return setDataRoamingEnabled(true) + .then(getDataApnSettings) + .then(function(aResult) { + // If already set, then save original APN settings. + origApnSettings = JSON.parse(JSON.stringify(aResult)); + return aResult; + }, function() { + // Return our own default value. + return [[{ "carrier": "T-Mobile US", + "apn": "epc.tmobile.com", + "mmsc": "http://mms.msg.eng.t-mobile.com/mms/wapenc", + "types": ["default", "supl", "mms"] }]]; + }) + + .then(function(aApnSettings) { + return Promise.resolve() + + .then(() => doTestHome(aApnSettings, "NoSuchProtocol")) + .then(() => doTestHome(aApnSettings, "IP")) + .then(() => doTestHome(aApnSettings, "IPV6")) + + .then(() => setEmulatorRoamingAndWait(true)) + + .then(() => doTestRoaming(aApnSettings, "NoSuchProtocol")) + .then(() => doTestRoaming(aApnSettings, "IP")) + .then(() => doTestRoaming(aApnSettings, "IPV6")) + + .then(() => setEmulatorRoamingAndWait(false)); + }) + + .then(() => setDataRoamingEnabled(false)) + .then(function() { + if (origApnSettings) { + return setDataApnSettings(origApnSettings); + } + }); +}, ["settings-read", "settings-write"]); diff --git a/dom/mobilemessage/tests/marionette/head.js b/dom/mobilemessage/tests/marionette/head.js index fd2572e36074..2c9bba498f73 100644 --- a/dom/mobilemessage/tests/marionette/head.js +++ b/dom/mobilemessage/tests/marionette/head.js @@ -5,7 +5,8 @@ const {Cc: Cc, Ci: Ci, Cr: Cr, Cu: Cu} = SpecialPowers; let Promise = Cu.import("resource://gre/modules/Promise.jsm").Promise; -/* Push required permissions and test if |navigator.mozMobileMessage| exists. +/** + * Push required permissions and test if |navigator.mozMobileMessage| exists. * Resolve if it does, reject otherwise. * * Fulfill params: @@ -44,7 +45,8 @@ function ensureMobileMessage() { return deferred.promise; } -/* Send a SMS message to a single receiver. Resolve if it succeeds, reject +/** + * Send a SMS message to a single receiver. Resolve if it succeeds, reject * otherwise. * * Fulfill params: @@ -72,7 +74,8 @@ function sendSmsWithSuccess(aReceiver, aText) { return deferred.promise; } -/* Send a MMS message with specified parameters. Resolve if it fails, reject +/** + * Send a MMS message with specified parameters. Resolve if it fails, reject * otherwise. * * Fulfill params: @@ -100,7 +103,8 @@ function sendMmsWithFailure(aMmsParameters) { return deferred.promise; } -/* Retrieve messages from database. +/** + * Retrieve messages from database. * * Fulfill params: * messages -- an array of {Sms,Mms}Message instances. @@ -136,7 +140,8 @@ function getMessages(aFilter, aReverse) { return deferred.promise; } -/* Retrieve all messages from database. +/** + * Retrieve all messages from database. * * Fulfill params: * messages -- an array of {Sms,Mms}Message instances. @@ -150,7 +155,8 @@ function getAllMessages() { return getMessages(null, false); } -/* Retrieve all threads from database. +/** + * Retrieve all threads from database. * * Fulfill params: * threads -- an array of MozMobileMessageThread instances. @@ -179,7 +185,8 @@ function getAllThreads() { return deferred.promise; } -/* Retrieve a single specified thread from database. +/** + * Retrieve a single specified thread from database. * * Fulfill params: * thread -- a MozMobileMessageThread instance. @@ -204,7 +211,8 @@ function getThreadById(aThreadId) { }); } -/* Delete messages specified from database. +/** + * Delete messages specified from database. * * Fulfill params: * result -- an array of boolean values indicating whether delesion was @@ -234,7 +242,8 @@ function deleteMessagesById(aMessageIds) { return deferred.promise; } -/* Delete messages specified from database. +/** + * Delete messages specified from database. * * Fulfill params: * result -- an array of boolean values indicating whether delesion was @@ -252,7 +261,8 @@ function deleteMessages(aMessages) { return deleteMessagesById(ids); } -/* Delete all messages from database. +/** + * Delete all messages from database. * * Fulfill params: * ids -- an array of numeric values identifying those deleted @@ -269,7 +279,8 @@ function deleteAllMessages() { let pendingEmulatorCmdCount = 0; -/* Send emulator command with safe guard. +/** + * Send emulator command with safe guard. * * We should only call |finish()| after all emulator command transactions * end, so here comes with the pending counter. Resolve when the emulator @@ -301,7 +312,8 @@ function runEmulatorCmdSafe(aCommand) { return deferred.promise; } -/* Send simple text SMS to emulator. +/** + * Send simple text SMS to emulator. * * Fulfill params: * result -- an array of emulator response lines. @@ -316,7 +328,8 @@ function sendTextSmsToEmulator(aFrom, aText) { return runEmulatorCmdSafe(command); } -/* Send raw SMS TPDU to emulator. +/** + * Send raw SMS TPDU to emulator. * * Fulfill params: * result -- an array of emulator response lines. @@ -331,7 +344,8 @@ function sendRawSmsToEmulator(aPdu) { return runEmulatorCmdSafe(command); } -/* Name space for MobileMessageDB.jsm. Only initialized after first call to +/** + * Name space for MobileMessageDB.jsm. Only initialized after first call to * newMobileMessageDB. */ let MMDB; @@ -348,7 +362,8 @@ function newMobileMessageDB() { return mmdb; } -/* Initialize a MobileMessageDB. Resolve if initialized with success, reject +/** + * Initialize a MobileMessageDB. Resolve if initialized with success, reject * otherwise. * * Fulfill params: a MobileMessageDB instance. @@ -378,7 +393,8 @@ function initMobileMessageDB(aMmdb, aDbName, aDbVersion) { return deferred.promise; } -/* Close a MobileMessageDB. +/** + * Close a MobileMessageDB. * * @return The passed MobileMessageDB instance. */ @@ -387,7 +403,8 @@ function closeMobileMessageDB(aMmdb) { return aMmdb; } -/* Create a new array of id attribute of input messages. +/** + * Create a new array of id attribute of input messages. * * @param aMessages an array of {Sms,Mms}Message instances. * @@ -404,7 +421,8 @@ function messagesToIds(aMessages) { // A reference to a nsIUUIDGenerator service. let uuidGenerator; -/* Generate a new UUID. +/** + * Generate a new UUID. * * @return A UUID string. */ @@ -418,7 +436,8 @@ function newUUID() { return uuidGenerator.generateUUID().toString(); } -/* Flush permission settings and call |finish()|. +/** + * Flush permission settings and call |finish()|. */ function cleanUp() { waitFor(function() { @@ -433,6 +452,14 @@ function cleanUp() { }); } +/** + * Basic test routine helper for mobile message tests. + * + * This helper does nothing but clean-ups. + * + * @param aTestCaseMain + * A function that takes no parameter. + */ function startTestBase(aTestCaseMain) { Promise.resolve() .then(aTestCaseMain) @@ -442,6 +469,15 @@ function startTestBase(aTestCaseMain) { }); } +/** + * Common test routine helper for mobile message tests. + * + * This function ensures global |manager| variable is available during the + * process and performs clean-ups as well. + * + * @param aTestCaseMain + * A function that takes no parameter. + */ function startTestCommon(aTestCaseMain) { startTestBase(function() { return ensureMobileMessage() From a33d463cf64df3f24c0299c46530a76f4adc11fe Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 07:20:42 -0700 Subject: [PATCH 34/47] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/119485d3bc4b Author: Etienne Segonzac Desc: Merge pull request #16992 from etiennesegonzac/bug-980984-incoming-alert-from-system Bug 980984 - Alert the user of an incoming from the system app to improve performance. r=alive, rik ======== https://hg.mozilla.org/integration/gaia-central/rev/3d88afa29e3d Author: Etienne Segonzac Desc: Bug 980984 - Alert the user of an incoming from the system app to improve performance. r=alive, rik --- 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 07162f4892b1..0224e22a0ef7 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "7086fc75af7c9622ade59a42308f50673fdc4c22", + "revision": "119485d3bc4b58a61ee4af208a4a457c27bd38d9", "repo_path": "/integration/gaia-central" } From 5f9f7f791d546ac9ac6dc27412eb8a41d0e41af7 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 07:26:10 -0700 Subject: [PATCH 35/47] Bumping manifests a=b2g-bump --- 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/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index c5290097cb1a..edd36a2ba54f 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 6f47d5040376..5298422fa488 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 885611425b41..8da698ff9c62 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 c5290097cb1a..edd36a2ba54f 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index f922729ecfec..3a25ca8ba3a7 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 db8bbb6acbc6..5f01e9636d97 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index a1dcf080c84d..c9936ed18029 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 9435229b8280..fe0c9085ce12 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index d2eeeb31e8c2..b8b7852f624b 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index f61c5a026a17..f0a451bf4de5 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 3c825416416c27f71f5a3b48b7136900e34c0403 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 07:45:26 -0700 Subject: [PATCH 36/47] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/d25390120160 Author: Amir Nissim Desc: Merge pull request #17004 from EverythingMe/968918-revert-collection-icon Bug 968918 - [B2G][Everything.me][Smart Collections] Revert to Default I... ======== https://hg.mozilla.org/integration/gaia-central/rev/76fd2efb6085 Author: Amir Nissim Desc: Bug 968918 - [B2G][Everything.me][Smart Collections] Revert to Default Icon [r=ranbena] --- 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 0224e22a0ef7..229583458f9c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "119485d3bc4b58a61ee4af208a4a457c27bd38d9", + "revision": "d253901201604414439ee9e08569189ecd223e9c", "repo_path": "/integration/gaia-central" } From c3766b00248e94937062170e171602550183bb27 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 07:51:04 -0700 Subject: [PATCH 37/47] Bumping manifests a=b2g-bump --- 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/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index edd36a2ba54f..db50e80f92b8 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 5298422fa488..2894536c06a2 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 8da698ff9c62..470dc26c4475 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 edd36a2ba54f..db50e80f92b8 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 3a25ca8ba3a7..492b8a844708 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 5f01e9636d97..06adfd7c4c36 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index c9936ed18029..4bfa87c42b06 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index fe0c9085ce12..8ac8ed29f3b5 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index b8b7852f624b..bb657def2969 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index f0a451bf4de5..cf3bc8b6e869 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 56821c8d76c3e5b8195e12cf272c03f6e168b11a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 08:00:24 -0700 Subject: [PATCH 38/47] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/ea76d4fe9662 Author: Wilson Page Desc: Merge pull request #17027 from wilsonpage/bug/980877 Bug 980877 - Directly deleting picture taken does not work ======== https://hg.mozilla.org/integration/gaia-central/rev/061ea27f35af Author: Wilson Page Desc: Bug 980877 - Directly deleting picture taken does not work --- 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 229583458f9c..63b02739935f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "d253901201604414439ee9e08569189ecd223e9c", + "revision": "ea76d4fe966287007ff7a2c0ab6962cf1a484ea3", "repo_path": "/integration/gaia-central" } From 481dd4335bbdd8913fd64be0cb525675f253a809 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 08:06:02 -0700 Subject: [PATCH 39/47] Bumping manifests a=b2g-bump --- 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/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index db50e80f92b8..5b17ecda1f2a 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 2894536c06a2..2157f796148c 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 470dc26c4475..1096ea3e69a3 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 db50e80f92b8..5b17ecda1f2a 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 492b8a844708..780156ec64c1 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 06adfd7c4c36..533a53287da9 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 4bfa87c42b06..833c51fa5679 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 8ac8ed29f3b5..53c9b22186b6 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index bb657def2969..e9bf71004313 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index cf3bc8b6e869..aa47ff361d1d 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 38fbd2f7348f4306ec34292bf0c30ddcab38b8de Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 09:00:24 -0700 Subject: [PATCH 40/47] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/8dd1d2267841 Author: vingtetun <21@vingtetun.org> Desc: Merge pull request #17001 from vingtetun/bug981277 Bug981277 ======== https://hg.mozilla.org/integration/gaia-central/rev/d9d417e6b371 Author: Vivien Nicolas <21@vingtetun.org> Desc: Bug 981277 - Remove a sync reflow when using the cards view. r=etienne --- 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 63b02739935f..40230bb9bf7f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "ea76d4fe966287007ff7a2c0ab6962cf1a484ea3", + "revision": "8dd1d2267841fa3ba59a3962daf3913a6dc385e8", "repo_path": "/integration/gaia-central" } From c0839d77a5e301b55520a34440a10aef835adf3f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 09:01:47 -0700 Subject: [PATCH 41/47] Bumping manifests a=b2g-bump --- 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/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 5b17ecda1f2a..87258a146d9b 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 2157f796148c..faa73f9a91d5 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 1096ea3e69a3..6853198b20ff 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 5b17ecda1f2a..87258a146d9b 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 780156ec64c1..5c0edb6100ae 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 533a53287da9..dcb49c1ac15e 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 833c51fa5679..759a2a6f7b9b 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 53c9b22186b6..8b98f46f739f 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index e9bf71004313..c43b9c4b2d44 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index aa47ff361d1d..526102c145fa 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From c4109b97a43cb85e989af8d6a096e4f72e11e465 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 09:15:28 -0700 Subject: [PATCH 42/47] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/5f23f25eb8a0 Author: Zac Desc: Merge pull request #17080 from chirarobert/skip_clock_app Bug 982134 - Skip test_clock_set_alarm.py with Bug 982128 ======== https://hg.mozilla.org/integration/gaia-central/rev/a487a8035353 Author: chirarobert Desc: Bug 982134 - Skip test_clock_set_alarm.py with Bug 982128 ======== https://hg.mozilla.org/integration/gaia-central/rev/affea58483ac Author: Zac Desc: Merge pull request #17076 from zacc/bug_982048_xfail Bug 982048 - Xfail test_email_keyboard.py with bug 982113 ======== https://hg.mozilla.org/integration/gaia-central/rev/515d9d178cf5 Author: zac Desc: Bug 982048 - Xfail test_email_keyboard.py with bug 982113 --- 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 40230bb9bf7f..8019a3555137 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "8dd1d2267841fa3ba59a3962daf3913a6dc385e8", + "revision": "5f23f25eb8a06f5e30647e30217e8c635f88ce84", "repo_path": "/integration/gaia-central" } From 5b719f9b862acfbe22cdc56bc5bd955ee0182b4d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 09:16:58 -0700 Subject: [PATCH 43/47] Bumping manifests a=b2g-bump --- 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/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 87258a146d9b..39da5940448c 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 faa73f9a91d5..8b772ae89c7c 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 6853198b20ff..d286d4c3b457 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 87258a146d9b..39da5940448c 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 5c0edb6100ae..fe134cf0077a 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 dcb49c1ac15e..00c16ce33c27 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 759a2a6f7b9b..fe7e1a9ea9fe 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 8b98f46f739f..46930d9b33ca 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index c43b9c4b2d44..2f2d2549408d 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 526102c145fa..6d34fa074179 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 94fda1f9d39ad387be23ce4c972de3fc543c2f6a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 09:25:22 -0700 Subject: [PATCH 44/47] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/f9350e0a6c86 Author: Germán Toro del Valle Desc: Merge pull request #16910 from gtorodelvalle/contacts-bug-972600-add-contact-after-merging Bug 972600 - [B2G][Contacts] After merging duplicate contacts selecting edit contact button brings up 'Add contact' screen (r=arcturus) ======== https://hg.mozilla.org/integration/gaia-central/rev/062d14925bfc Author: Germán Toro del Valle Desc: Bug 972600 - [B2G][Contacts] After merging duplicate contacts selecting edit contact button brings up 'Add contact' screen --- 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 8019a3555137..a5e21d8bb7dc 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "5f23f25eb8a06f5e30647e30217e8c635f88ce84", + "revision": "f9350e0a6c862fe4804d571460ef941f79c4bdb0", "repo_path": "/integration/gaia-central" } From 307d1499aab331b8b4bbb79db875e2aae9616428 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 09:31:19 -0700 Subject: [PATCH 45/47] Bumping manifests a=b2g-bump --- 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/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 39da5940448c..c9f3f131c39b 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 8b772ae89c7c..f144248d5c18 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 d286d4c3b457..547a82e1912d 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 39da5940448c..c9f3f131c39b 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index fe134cf0077a..ca52c3776263 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 00c16ce33c27..0808dd5f98db 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index fe7e1a9ea9fe..5aac18785a74 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 46930d9b33ca..dd920b356a4c 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 2f2d2549408d..15badbbf3a22 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 6d34fa074179..4d4efc1c6855 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From b795a0395bf5ed4d09d03dabdab09be870590548 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 09:40:24 -0700 Subject: [PATCH 46/47] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/93de9c5bcb90 Author: Ryan VanderMeulen Desc: Revert "Merge pull request #16992 from etiennesegonzac/bug-980984-incoming-alert-from-system" This reverts commit 88677ea30dff41d6dc404ab95285d318accdd738, reversing changes made to 6826cb8e2589651fbe3ec15b4fa9cb9a372de4cf. --- 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 a5e21d8bb7dc..5b7cdb264724 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "f9350e0a6c862fe4804d571460ef941f79c4bdb0", + "revision": "93de9c5bcb90ae32bd3599b185f4bbf67e4529ff", "repo_path": "/integration/gaia-central" } From 7e57f4942c3740c583f52d62caaa18dc3c382d2e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Mar 2014 09:46:06 -0700 Subject: [PATCH 47/47] Bumping manifests a=b2g-bump --- 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/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index c9f3f131c39b..fe293bb6e4e0 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 f144248d5c18..b39c5e8a339b 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 547a82e1912d..c57e9b88a604 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 c9f3f131c39b..fe293bb6e4e0 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index ca52c3776263..6eba97b45284 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 0808dd5f98db..1b28a400c2d0 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 5aac18785a74..44d04d6ac832 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index dd920b356a4c..d1fbcd541464 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 15badbbf3a22..6deb2c5cbb71 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 4d4efc1c6855..fc9275484961 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - +