From 7302d5cbbfa724c03786e3ca25e672dbc61848d5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 4 Aug 2015 12:45:30 -0700 Subject: [PATCH] Bumping gaia.json for 8 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/ab733edd71b6 Author: Marcus Cavanaugh Desc: Merge pull request #31221 from mcav/disable-timer-test Bug 1153495 - Disable intermittent timer_test.js. r=mmedeiros ======== https://hg.mozilla.org/integration/gaia-central/rev/525645d5cef3 Author: Marcus Cavanaugh Desc: Bug 1153495 - Disable intermittent timer_test.js ======== https://hg.mozilla.org/integration/gaia-central/rev/a9d5fac23437 Author: lissyx Desc: Merge pull request #30877 from lissyx/killswitch Bug 1181505 - Add support for killswitch command in FMD r=... ======== https://hg.mozilla.org/integration/gaia-central/rev/7326367ad156 Author: Alexandre Lissy Desc: Bug 1181505 - Add support for killswitch command in FMD r=mgoodwin ======== https://hg.mozilla.org/integration/gaia-central/rev/189a93f1e01b Author: lissyx Desc: Merge pull request #31201 from lissyx/bug1189758 Bug 1189758 - Create only one instance of SettingsHelper r=mgoodwin ======== https://hg.mozilla.org/integration/gaia-central/rev/b39879b99939 Author: Alexandre Lissy Desc: Bug 1189758 - Create only one SettingsHelper(findmydevice.retry-count) r=mgoodwin ======== https://hg.mozilla.org/integration/gaia-central/rev/4db1aeb229b4 Author: Ben Francis Desc: Merge pull request #31160 from benfrancis/1168951 Bug 1168951 - Pin Page r=albertopq ======== https://hg.mozilla.org/integration/gaia-central/rev/016e810faecd Author: Ben Francis Desc: Bug 1168951 - Pin Page --- 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 4e8dd68a8e1c..955688420960 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "c5425d9f1f5184731a59ed4bc99295acbde30390", + "git_revision": "c41d7f1676c4e98c8fc6b8eb46e8d27a6ccdd91c", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "68ce99a4e1761c06e5f31f6674ee46fef1bbf44b", + "revision": "ab733edd71b6e4bfbca3806e67976a83963294c2", "repo_path": "integration/gaia-central" }