Merge mozilla-central to mozilla-inbound
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 22 Jun 2016 15:52:34 +0200
changeset 302337 812e027b2adeaadb9b11db9303327300512a2ec9
parent 302333 618beb1df168d8bbdf3982303a0768eba7c2d744 (current diff)
parent 302336 c9edfe35619f69f7785776ebd19a3140684024dc (diff)
child 302338 fdd1161f445604e720214966a7eaed8e7833ad9e
push id78700
push usercbook@mozilla.com
push dateWed, 22 Jun 2016 13:52:44 +0000
treeherdermozilla-inbound@812e027b2ade [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 mozilla-inbound
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: