From b74e5e24f93641fedcb8a2b2c5d7307b6dcbf04c Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sat, 3 Jan 2015 16:04:46 +0000
Subject: [PATCH] Merged r13826 from trunk to 2.6-stable.

add jruby-21mode to .travis.yml.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13827 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 2ac840bc1..7811200d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,11 +8,13 @@ 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"
-- 
2.39.5