aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-07-27 13:12:19 +1000
committerJason Zaugg <jzaugg@gmail.com>2015-07-27 13:12:19 +1000
commitf61a34c08a88fc320ec24cc4f56f3fbc3ad32b9c (patch)
treeac1998541be3a0c96e7e3fceda5dbac8452b2418
parent017928c43a6520c136d30af08d2bc3f441c2088a (diff)
parent6d16022a3c72dc0237def04e9de11d3bfa31c331 (diff)
downloadscala-async-f61a34c08a88fc320ec24cc4f56f3fbc3ad32b9c.tar.gz
scala-async-f61a34c08a88fc320ec24cc4f56f3fbc3ad32b9c.tar.bz2
scala-async-f61a34c08a88fc320ec24cc4f56f3fbc3ad32b9c.zip
Merge pull request #126 from retronym/merge/2.10.x-to-master-20150727
Merge 2.10.x to master
-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