Bug 1280476 - resolved merge conflict with bug 1280437; r=grenade, a=tomcat
authorPeter Moore <pmoore@mozilla.com>
Wed, 22 Jun 2016 14:26:42 +0200
changeset 302311 c9edfe35619f69f7785776ebd19a3140684024dc
parent 302310 dfd38b2b6778991dc4b4378d8873deead00bc9f1
child 302326 86cedfebcbda916da044c04efd0bb6c80f5b5587
child 302359 812e027b2adeaadb9b11db9303327300512a2ec9
push id30358
push usercbook@mozilla.com
push dateWed, 22 Jun 2016 13:38:14 +0000
treeherdermozilla-central@c9edfe35619f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgrenade, tomcat
bugs1280476, 1280437
milestone50.0a1
first release with
nightly linux32
c9edfe35619f / 50.0a1 / 20160623030210 / files
nightly linux64
c9edfe35619f / 50.0a1 / 20160623030210 / files
nightly mac
c9edfe35619f / 50.0a1 / 20160623030210 / files
nightly win32
c9edfe35619f / 50.0a1 / 20160623030210 / files
nightly win64
c9edfe35619f / 50.0a1 / 20160623030210 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1280476 - resolved merge conflict with bug 1280437; r=grenade, a=tomcat
taskcluster/ci/legacy/tasks/tests/fx_android-api-15_generic.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: