Bumping gaia.json for 22 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/bad81381cd06
Author: Malini Das <thehyperballad@gmail.com>
Desc: Merge pull request #14138 from malini/mixin

 Bug 925398: Refactor Gaia-ui-tests to use Marionette mixins, r=davehunt

========

https://hg.mozilla.org/integration/gaia-central/rev/af2a095e49b2
Author: Malini Das <mdas@mozilla.com>
Desc: Merge branch 'master' of git://github.com/mozilla-b2g/gaia into mixin

========

https://hg.mozilla.org/integration/gaia-central/rev/4b533646c1f9
Author: Malini Das <mdas@mozilla.com>
Desc: Merge branch 'master' of git://github.com/mozilla-b2g/gaia into mixin

========

https://hg.mozilla.org/integration/gaia-central/rev/540a8fdf4fd2
Author: Malini Das <mdas@mozilla.com>
Desc: Merge branch 'master' of git://github.com/mozilla-b2g/gaia into mixin

========

https://hg.mozilla.org/integration/gaia-central/rev/1952fd9fa38e
Author: Malini Das <mdas@mozilla.com>
Desc: Merge branch 'master' of git://github.com/mozilla-b2g/gaia into mixin

========

https://hg.mozilla.org/integration/gaia-central/rev/0965afa4bb03
Author: Malini Das <mdas@mozilla.com>
Desc: use specific imports for Bug 943313

========

https://hg.mozilla.org/integration/gaia-central/rev/09cd0bfddc46
Author: Malini Das <mdas@mozilla.com>
Desc: remove extra whitespace

========

https://hg.mozilla.org/integration/gaia-central/rev/7c00005a1b77
Author: Malini Das <mdas@mozilla.com>
Desc: Merge branch 'master' of git://github.com/mozilla-b2g/gaia into mixin

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/runtests.py

========

https://hg.mozilla.org/integration/gaia-central/rev/51b8913663fc
Author: Malini Das <mdas@mozilla.com>
Desc: accidentally removed close_app

========

https://hg.mozilla.org/integration/gaia-central/rev/e6e61f8bde3e
Author: Malini Das <mdas@mozilla.com>
Desc: bad merge

========

https://hg.mozilla.org/integration/gaia-central/rev/1adda13809d7
Author: Malini Das <mdas@mozilla.com>
Desc: Merge branch 'master' of git://github.com/mozilla-b2g/gaia into mixin

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/gaia_test.py
	tests/python/gaia-ui-tests/gaiatest/runtests.py

========

https://hg.mozilla.org/integration/gaia-central/rev/db289d4bf1c5
Author: Malini Das <mdas@mozilla.com>
Desc: Merge branch 'master' of git://github.com/mozilla-b2g/gaia into mixin

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/gaia_test.py
	tests/python/gaia-ui-tests/gaiatest/runtests.py

========

https://hg.mozilla.org/integration/gaia-central/rev/8ec00f4142cd
Author: Malini Das <mdas@mozilla.com>
Desc: use b2g and endurance mixins

========

https://hg.mozilla.org/integration/gaia-central/rev/887913940107
Author: Malini Das <mdas@mozilla.com>
Desc: remove unnecessary imports

========

https://hg.mozilla.org/integration/gaia-central/rev/b9fe55df7fea
Author: Malini Das <mdas@mozilla.com>
Desc: use the html test result mixin

========

https://hg.mozilla.org/integration/gaia-central/rev/9912d20a5998
Author: Malini Das <mdas@mozilla.com>
Desc: use HTMLReportingTestResult

========

https://hg.mozilla.org/integration/gaia-central/rev/b09871d7180a
Author: Malini Das <mdas@mozilla.com>
Desc: remove report directory. It has moved to marionette

========

https://hg.mozilla.org/integration/gaia-central/rev/b1e22496fe52
Author: Malini Das <mdas@mozilla.com>
Desc: Merge branch 'mixin' of https://github.com/malini/gaia into mixin

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/runtests.py

========

https://hg.mozilla.org/integration/gaia-central/rev/eb761b3c37f1
Author: Malini Das <mdas@mozilla.com>
Desc: use mixin pattern

========

https://hg.mozilla.org/integration/gaia-central/rev/838b222ae9d6
Author: Malini Das <mdas@mozilla.com>
Desc: move gaia mixins to gaia-ui-tests

========

https://hg.mozilla.org/integration/gaia-central/rev/e2129a9a157a
Author: Malini Das <mdas@mozilla.com>
Desc: use mixin pattern

========

https://hg.mozilla.org/integration/gaia-central/rev/a3117082d61f
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Revert "Bug 944718 - [Cost Control] Broken access to usage widget from utility tray"

This reverts commit 0fd00a3977999c89193f576e8f32973cfb185a58.
This commit is contained in:
Gaia Pushbot 2013-12-05 09:06:24 -08:00
parent 5de52273cf
commit 3e92e38244

View File

@ -1,4 +1,4 @@
{
"revision": "6434a9e432b59dd3f7adb38d625031a65646b03b",
"revision": "bad81381cd06497f2bf14e2faaa5180fcbd439a1",
"repo_path": "/integration/gaia-central"
}