Merge mozilla-central to fx-team
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 22 Jun 2016 15:53:13 +0200
changeset 302453 86cedfebcbda916da044c04efd0bb6c80f5b5587
parent 302452 7687a980146e848a1c33ddc606d35fb046081ed8 (current diff)
parent 302336 c9edfe35619f69f7785776ebd19a3140684024dc (diff)
child 302454 b5fa754a35da091bb0c2b197317cd5627f6c8486
push id78742
push usercbook@mozilla.com
push dateThu, 23 Jun 2016 13:14:27 +0000
treeherdermozilla-inbound@5a7fbec80871 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone50.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
Merge mozilla-central to fx-team
taskcluster/ci/legacy/tasks/tests/fx_docker_desktop_generic.yml
taskcluster/ci/legacy/tasks/tests/fx_docker_test_base.yml
--- a/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_generic.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_generic.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_desktop_generic.yml'
 task:
   payload:
     cache:
       tooltool-cache: '/home/worker/tooltool-cache'
     capabilities:
       devices:
         loopbackVideo: true
     command: