Resolve merge conflict, update rspec syntax

[arvados.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 87b773359d8eda499f431da5fcc2dd9b27b0c815..be99f1c3635e6ba19ef204ce9a83d67967b971a5 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,10 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
-  - jruby
-  - ree
+  - 2.1.0
+  - rbx-2
+  - jruby-19mode
 script: "bundle exec rake spec:all"
 before_install:
  - sudo apt-get update
@@ -16,6 +15,3 @@ notifications:
       - sbazyl@google.com
     on_success: change
     on_failure: change
-matrix:
-  allow_failures:
-    - rvm: 2.0.0