diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-06-16 15:57:13 -0300 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-06-16 15:57:13 -0300 |
| commit | 87fa7a8c3e774eeed5d2945f5de15c0d1e3d48cb (patch) | |
| tree | c59b309e7df618580ef2f22ddb9f48faea9e9822 /.travis.yml | |
| parent | b0ec8c43a4fa4f7546eabdf141726fab61db48b7 (diff) | |
| parent | 4abab8df49d1bc5d9a051a8b54852e0712be7b74 (diff) | |
| download | Kamon-87fa7a8c3e774eeed5d2945f5de15c0d1e3d48cb.tar.gz Kamon-87fa7a8c3e774eeed5d2945f5de15c0d1e3d48cb.tar.bz2 Kamon-87fa7a8c3e774eeed5d2945f5de15c0d1e3d48cb.zip | |
Merge branch 'master' into release-0.3_scala-2.11
Conflicts:
.travis.yml
project/Dependencies.scala
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 2e7f46f0..734b0e39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ language: scala +script: + - sbt ++$TRAVIS_SCALA_VERSION 'set concurrentRestrictions in Global += Tags.limit(Tags.Compile, 2)' compile test:compile + - sbt ++$TRAVIS_SCALA_VERSION -Dakka.test.timefactor=1.5 'set concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)' test scala: - 2.11.1
\ No newline at end of file |