Merge remote-tracking branch 'upstream/master'

JuliaStats · Oct 8, 2016 · 2fb1667 · 2fb1667
2 parents cf5b24f + 8a9e13e
commit 2fb1667
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,15 @@
 language: julia
 os:
-    - linux
-    - osx
+  - linux
+  - osx
 julia:
-    - 0.3
-    - 0.4
-    - nightly
+  - 0.3
+  - 0.4
+  - 0.5
+  - nightly
 notifications:
-    email: false
-sudo: false
-script:
-    - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-    - julia -e 'Pkg.clone(pwd()); Pkg.build("MLBase");  Pkg.test("MLBase")'
+  email: false
+# sudo: false
+# script:
+#   - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
+#   - julia -e 'Pkg.clone(pwd()); Pkg.build("MLBase");  Pkg.test("MLBase")'