From e18c31e43ced84166b18126643b47235c214ca8b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 26 Oct 2015 13:40:18 -0700 Subject: [PATCH] Bumping gaia.json for 24 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/79a6719591ce Author: Martijn Desc: Merge pull request #32721 from mwargers/1218108 Bug 1218108 - Failure in test_marketplace_addon.py because of changing install button ======== https://hg.mozilla.org/integration/gaia-central/rev/84363d8cf283 Author: Martijn Wargers Desc: Bug 1218104 - Failure in test_marketplace_addon.py because of changing install button ======== https://hg.mozilla.org/integration/gaia-central/rev/ca7c5e8224a6 Author: Martijn Desc: Merge pull request #32722 from mwargers/1218115 Bug 1218115 - Failure in test_settings_media_storage_change.py in camera.launch ======== https://hg.mozilla.org/integration/gaia-central/rev/a199d227bfd7 Author: Martijn Wargers Desc: Bug 1218115 - Failure in test_settings_media_storage_change.py in camera.launch ======== https://hg.mozilla.org/integration/gaia-central/rev/fa023a3fd263 Author: Hubert Figuière Desc: Merge pull request #32742 from hfiguiere/bug1217234-fm-bookmark Bug 1217234 - Fix tap on FM bookmark r=justindarc ======== https://hg.mozilla.org/integration/gaia-central/rev/23dbd5dce042 Author: Hubert Figuière Desc: Bug 1217234 - Fix tap on FM bookmark ======== https://hg.mozilla.org/integration/gaia-central/rev/479d5a6e2412 Author: John Dorlus Desc: Merge pull request #31336 from silne30/Bug_1193978_Stopwatch_Laps_Test Bug 1193978 - Automated Test [Clock] Use stopwatch, set a few laps, reset. ======== https://hg.mozilla.org/integration/gaia-central/rev/2bd8b9ab1103 Author: John Dorlus Desc: Fixed merge conflicts. ======== https://hg.mozilla.org/integration/gaia-central/rev/d72b37bdd260 Author: John Dorlus Desc: Merge branch 'master' of https://github.com/silne30/gaia into Bug_1193978_Stopwatch_Laps_Test ======== https://hg.mozilla.org/integration/gaia-central/rev/db2b900fee06 Author: John Dorlus Desc: Merged latest master into my fork. Fixed commit ======== https://hg.mozilla.org/integration/gaia-central/rev/2eb2371a5870 Author: John Dorlus Desc: Merge branch 'master' of https://github.com/silne30/gaia into Bug_1193978_Stopwatch_Laps_Test ======== https://hg.mozilla.org/integration/gaia-central/rev/d10b77710517 Author: John Dorlus Desc: Merge branch 'silne30-Bug_1193978_Stopwatch_Laps_Test' ======== https://hg.mozilla.org/integration/gaia-central/rev/1e3a9d40ca7b Author: John Dorlus Desc: Merge branch 'Bug_1193978_Stopwatch_Laps_Test' of https://github.com/silne30/gaia into silne30-Bug_1193978_Stopwatch_Laps_Test ======== https://hg.mozilla.org/integration/gaia-central/rev/aea6f5f333f3 Author: John Dorlus Desc: Added stopwatch timepicker region and timer changes. ======== https://hg.mozilla.org/integration/gaia-central/rev/a15a17af33be Author: John Dorlus Desc: Adjusted times. ======== https://hg.mozilla.org/integration/gaia-central/rev/288c0d168723 Author: John Dorlus Desc: Made changes per PR. ======== https://hg.mozilla.org/integration/gaia-central/rev/7c14a1aa588a Author: John Dorlus Desc: Made most recent changes ======== https://hg.mozilla.org/integration/gaia-central/rev/8a648344c5d4 Author: John Dorlus Desc: Made changes to tests from PR. ======== https://hg.mozilla.org/integration/gaia-central/rev/a45934fe5fc1 Author: John Dorlus Desc: Fixed stopwatch verify method and renamed. ======== https://hg.mozilla.org/integration/gaia-central/rev/51cbb81326da Author: John Dorlus Desc: Added manifest.ini file. ======== https://hg.mozilla.org/integration/gaia-central/rev/baf58c2dea3e Author: John Dorlus Desc: Made edits proposed on PR. ======== https://hg.mozilla.org/integration/gaia-central/rev/c04a5838810c Author: John Dorlus Desc: Merge branch 'master' of https://github.com/mozilla-b2g/gaia into Bug_1193978_Stopwatch_Laps_Test ======== https://hg.mozilla.org/integration/gaia-central/rev/a7b4a418bb97 Author: John Dorlus Desc: Made edits from Pull request and fixed create_new_alarm_test ======== https://hg.mozilla.org/integration/gaia-central/rev/0aac98025e2f Author: John Dorlus Desc: Made edits to the clock app object, added new regions and tests for stopwatch. --- 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 18ef93d371ba..3fc434daa83d 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "a129e5fb047d99f1810827cbf8bd09b95011bf57", + "git_revision": "d99c6f1cfc73d3081129f49441770c6a6edfe25e", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "9c80e796d129f062748b0aae03df23b9bbf48921", + "revision": "79a6719591ce0225f01b0c60ccbcc1a3543ac57e", "repo_path": "integration/gaia-central" }