Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
authorB2G Bumper Bot <release+b2gbumper@mozilla.com>
Tue, 02 Jun 2015 11:35:25 -0700
changeset 246807 1d706a82da3ceb6330b8f2381afc44d9bc60130d
parent 246806 c046d7b76f2fa4d31c264acf08f5a2af1ed138a1
child 246808 f0cf0486ce23c7c4ba1bd412e0c4e068b8e3373f
push id28840
push userkwierso@gmail.com
push dateWed, 03 Jun 2015 01:34:22 +0000
treeherdermozilla-central@b0a507af2b4a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgaia-bump
bugs1170120
milestone41.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/4f0ae2cade95 Author: Gareth Aye <gaye@mozilla.com> Desc: Merge pull request #30367 from gaye/bug-1170120 Bug 1170120 - Move dependency declarations from jsmarionette packages which landed in gaia to their appropriate fs location ======== https://hg.mozilla.org/integration/gaia-central/rev/2e71b1a9939d Author: gaye <gaye@mozilla.com> Desc: Revert "Revert "Bug 1170120 - Move dependency decls from jsm pkgs to appropriate manifests"" This reverts commit 6d477a7884273886605049b20f60af5c1583a150. Conflicts: package.json ======== https://hg.mozilla.org/integration/gaia-central/rev/1bf1636c105c Author: gaye <gaye@mozilla.com> Desc: Bug 1170120 - Rebuild local in-tree modules when using npm-cache r=nullaus
b2g/config/gaia.json
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "4f23badde371569716cbc209d2227ab2006fd096", 
+        "git_revision": "2fbadd586461010cabc2f08191f62090172b127e", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "74fae3d5a5fc77e3bc6e6a204a8765a513dbcc07", 
+    "revision": "4f0ae2cade95fffa4268d5d7d3d43c7efcfb2ac6", 
     "repo_path": "integration/gaia-central"
 }