From ea28291a62d574f8debb54f8bc6af7774150b6ae Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Sun, 3 Apr 2016 13:56:48 -0400
Subject: [PATCH] Re-engage servo-linux-cross1 on Travis

Upstream has released new packages for Ubuntu Trusty which resolve
the installation conflicts encountered when installing the ARM g++ packages.

See https://bugs.launchpad.net/ubuntu/+source/gcc-4.8-armhf-cross/+bug/1557205/comments/16
for a comment confirming release of the upstream fix.

This reverts commit aa8435536091a125494786997ab3c408dc3b3386.
---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 422d463b..22827891 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,8 +26,6 @@ matrix:
       dist: trusty
       language: python
       python: 3.5
-  allow_failures:
-    - env: SALT_NODE_ID=servo-linux-cross1
 
 script: .travis/dispatch.sh