From 0996ce79aad765a1aeb6dfa9741114b79c32f45e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 10 May 2015 06:55:33 -0700 Subject: [PATCH 1/4] 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/0dcc63ef0e09 Author: Staś Małolepszy Desc: Merge pull request #29769 from stasm/1159190-commit-hook Bug 1159190 - Add a commit hook which forbids mozL10n.get. r=julienw ======== https://hg.mozilla.org/integration/gaia-central/rev/03e6c1695f7f Author: Staś Małolepszy Desc: Bug 1159190 - Add a commit hook which forbids mozL10n.get. r=julienw f=gandalf --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 1b2fc7b93a85..6b26e3b942b0 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "5b2a150f6f5d29bddfaac13fcbbf099376f2f275", + "git_revision": "e6c247f8ab1887648b878ce557dab0d275a334dd", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "75e6c18c2cdd05073434a8d5e749c72a063a0521", + "revision": "0dcc63ef0e0997de8c2f0fd3405b210d054b6579", "repo_path": "integration/gaia-central" } From c03f5ad5339ee609a614e080aaa74136e0b92331 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 10 May 2015 06:57:42 -0700 Subject: [PATCH 2/4] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index d74b6412431f..0e0d32033a98 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index bf631c6fac3d..9b3e90e76449 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 66d6daab096d..7a7c439d9b3e 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 bc069c2f3b23..9961c4884806 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-l/sources.xml b/b2g/config/emulator-l/sources.xml index ec92106bcedb..379a2e5483cc 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index bf631c6fac3d..9b3e90e76449 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index f2f654f80d11..bac89944beac 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 26aa5f9ec6ea..66c351232343 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index c28f51392007..24e0e9ea3161 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 2ffb3873e784..d109f4540213 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 5b48009bf1aefb96ce804f563ab8b4a65bdf5571 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 10 May 2015 08:05:36 -0700 Subject: [PATCH 3/4] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/4bcdce164d36 Author: autolander Desc: Bug 1137094 - merge pull request #29914 from stasm:1137094-dont-pseudo-html to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/c5d97b4e67bf Author: Ted Clancy Desc: Bug 1137094 - Don't pseudolocalize HTML tags. r=stas --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 6b26e3b942b0..427da01a47a6 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "e6c247f8ab1887648b878ce557dab0d275a334dd", + "git_revision": "6089234ace8b294a8feef064387604bae16254e3", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "0dcc63ef0e0997de8c2f0fd3405b210d054b6579", + "revision": "4bcdce164d361f57742d042ff2742e3e6d53d7dd", "repo_path": "integration/gaia-central" } From dfff5082fc792f5009311154fd7b6928061c653f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 10 May 2015 08:07:46 -0700 Subject: [PATCH 4/4] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 0e0d32033a98..975cdd6b5efb 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 9b3e90e76449..82f7e740401b 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 7a7c439d9b3e..123d36b59009 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 9961c4884806..cdef7e4d650b 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-l/sources.xml b/b2g/config/emulator-l/sources.xml index 379a2e5483cc..633a9e9d1502 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 9b3e90e76449..82f7e740401b 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index bac89944beac..581551f2ab19 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 66c351232343..80984295b0b4 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 24e0e9ea3161..9d06f286f131 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index d109f4540213..831298729592 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - +