aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-07-27 13:11:24 +1000
committerJason Zaugg <jzaugg@gmail.com>2015-07-27 13:11:24 +1000
commit6d16022a3c72dc0237def04e9de11d3bfa31c331 (patch)
treeac1998541be3a0c96e7e3fceda5dbac8452b2418
parent017928c43a6520c136d30af08d2bc3f441c2088a (diff)
parenta1f9690d7f1e7008063c1f03fa6023c368a8f31a (diff)
downloadscala-async-6d16022a3c72dc0237def04e9de11d3bfa31c331.tar.gz
scala-async-6d16022a3c72dc0237def04e9de11d3bfa31c331.tar.bz2
scala-async-6d16022a3c72dc0237def04e9de11d3bfa31c331.zip
Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x-to-master-20150727
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 22ac9a3..93bfda8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
language: scala
-
+sudo: false
env:
global:
- PUBLISH_JDK=openjdk6 # admin/build.sh only publishes when running on this jdk