Resolve merge conflict, update rspec syntax

[arvados.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index d66aa8a98453f6507e35443151ec5df9300880ea..be99f1c3635e6ba19ef204ce9a83d67967b971a5 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,10 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1.0
   - rbx-2
-  - jruby-18mode
   - jruby-19mode
-  - ree
 script: "bundle exec rake spec:all"
 before_install:
  - sudo apt-get update