From c9fcfe684d4415fefee4dcaf3f0239ebc2d375e8 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 30 Apr 2015 16:32:17 -0700 Subject: [PATCH] Bumping gaia.json for 5 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-2_1s/rev/54fb2ab8a7f8 Author: Ryan VanderMeulen Desc: Merge branch 'v2.1' into v2.1s ======== https://hg.mozilla.org/integration/gaia-2_1s/rev/cb7c6d5c4190 Author: Fernando Jiménez Moreno Desc: Bug 1052227 - Move inapp pay test to packaged to avoid mochitest failures. r=kumar ======== https://hg.mozilla.org/integration/gaia-2_1s/rev/016c60830302 Author: PYChen, GaryChen Desc: Bug 1032441 - change css ======== https://hg.mozilla.org/integration/gaia-2_1s/rev/9d93c929d521 Author: Wil Clouser Desc: Merge pull request #29721 from ngokevin/v2.1 Bug 1158390 - update marketplace packages for v2.1 ======== https://hg.mozilla.org/integration/gaia-2_1s/rev/650c94c8cffa Author: Kevin Ngo Desc: Bug 1153890 - update marketplace packages for v2.1 --- 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 37da072d46c5..86f9070abc15 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "f0a1541be07dfa95d62f1f1b3624d76f07966cd7", + "git_revision": "fea8cbf6d0ea3d7ad5ffc1aa91b7d0fc2d05d5c6", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "f2dce81b4e56f14f827cbad533fb7f06b9cb43b8", + "revision": "54fb2ab8a7f881ef5b4432d6593f89334f6d70bf", "repo_path": "integration/gaia-2_1s" } -- 2.11.4.GIT