From 1d7da8d1a23e71b01d6cf6b9b61695ac315243a0 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 18 Dec 2015 18:44:41 -0800 Subject: [PATCH] Bumping gaia.json for 6 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/785347d914d8 Author: Ghislain 'Aus' Lacroix Desc: Merge pull request #33630 from mikehenrty/bug-1233880-wait-for-disappear-options Bug 1233880 - Allow passing options object into helper.waitForElement… ======== https://hg.mozilla.org/integration/gaia-central/rev/b5864a6733c3 Author: Michael Henretty Desc: Bug 1233880 - Allow passing options object into helper.waitForElementToDisappear ======== https://hg.mozilla.org/integration/gaia-central/rev/05572a0793f6 Author: Ghislain 'Aus' Lacroix Desc: Merge pull request #33631 from mikehenrty/bug-1233892-increase-all-timeouts Bug 1233892 - Increase searchTimeout, scriptTimeout and waitFor timeout ======== https://hg.mozilla.org/integration/gaia-central/rev/991e448efb02 Author: Michael Henretty Desc: Bug 1233892 - Increase searchTimeout, scriptTimeout and waitFor timeout ======== https://hg.mozilla.org/integration/gaia-central/rev/aa18d0545d6b Author: Ghislain 'Aus' Lacroix Desc: Merge pull request #33628 from mikehenrty/bug-1233823-wait-for-system-not-homescreen Bug 1233823 - Make marionette-apps.launch wait for system rather than… ======== https://hg.mozilla.org/integration/gaia-central/rev/cf50c422f334 Author: Michael Henretty Desc: Bug 1233823 - Make marionette-apps.launch wait for system rather than homescreen --- 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 89326e98e3b5..42edd2f02135 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "2267290a7b9480a194fe5b18b2a056b3ff641512", + "git_revision": "33c1dc1bf98c640c49d648e709e0fdbd8da2da78", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "6ec6a201c26d72e7e7ca44a1220916d39958afe1", + "revision": "785347d914d85b3babd6977258de358a9a3beed5", "repo_path": "integration/gaia-central" }