Merged upstream

jwillemsen · jwillemsen · commit dbec41f114ce · 2016-05-30T08:40:36.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -13,18 +13,18 @@ rvm:
   - jruby-head
   - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
+  - jruby-head
+  - rbx-2
+>>>>>>> de2e2acd91988e6b54f50f6c44ad85f28b68c615
 branches:
   only:
     - master
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-head
-    - rvm: rbx-18mode
-    - rvm: rbx-19mode
     - rvm: jruby-18mode
     - rvm: jruby-19mode
+    - rvm: jruby-head
+    - rvm: rbx-2
 script: "rake test" # test:scanners"
 sudo: false
