Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
authorB2G Bumper Bot <release+b2gbumper@mozilla.com>
Fri, 04 Apr 2014 10:16:03 -0700
changeset 192576 133e5cac20be7b635a40f18860f040f8e55735fd
parent 192575 f43526a66eb208416935d73950ac829f731ba360
child 192577 eefdf1d70fe278d92d83aa66442181b8c995f3b2
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgaia-bump
bugs17987, 17303, 982006
milestone30.0a2
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-1_4/rev/2f0f143bd33f Author: Ghislain 'Aus' Lacroix <aus@noiseport.org> Desc: Merge pull request #17987 from nullaus/v1.4 Merge pull request #17303 from nullaus/bug982006 ======== https://hg.mozilla.org/integration/gaia-1_4/rev/624f05fbeee8 Author: Ghislain 'Aus' Lacroix <aus@noiseport.org> Desc: Merge pull request #17303 from nullaus/bug982006 bug 982006(cherry picked from commit 288c8763265aa98c16c8b79cddaf37c3dd34d2a2) Conflicts: apps/system/test/unit/app_modal_dialog_test.js
b2g/config/gaia.json
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
         "git_revision": "", 
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "02861cb9c8485854dab0f2d7574432b37a3e7c05", 
+    "revision": "2f0f143bd33f2a67340162e2913d3ec5b9bd46d2", 
     "repo_path": "/integration/gaia-1_4"
 }