Merge pull request #2439 from solarce/sol-matrix-trusty-fix

Fixing matrix include so `os: linux` goes to trusty
2015-11-23 18:01:22 +00:00 · 2015-11-23 18:01:22 +00:00 · 83ddec8df7
parent 665de9a494 13081d4516
commit 83ddec8df7
1 changed files with 2 additions and 4 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -2,16 +2,14 @@ sudo: required

 language: python

-services:
-  - docker
-
 matrix:
  include:
    - os: linux
+      services:
+      - docker
    - os: osx
      language: generic

-
 install: ./script/travis/install

 script: