Merged r13880 from trunk to 2.6-stable

remove jruby-21mode from .travis.yml

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13884 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/.travis.yml b/.travis.yml
index 7811200d070b88dbc1dfa575ae9d6ba7920ac8f2..2ac840bc1aa413897656b4331d2919f1764fdac9 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,13 +8,11 @@ rvm:
   - 1.9.3
   - 2.0
   - 2.1
-  - jruby-21mode
   - jruby
 matrix:
   allow_failures:
     # SCM tests fail randomly due to IO.popen().
     # https://github.com/jruby/jruby/issues/779
-    - rvm: jruby-21mode
     - rvm: jruby
 env:
   - "TEST_SUITE=units       DATABASE_ADAPTER=postgresql"