Merge branch 'master' into xz-package-task

ruby · May 4, 2016 · 60b2f8a · 60b2f8a
2 parents 198bb72 + fae9598
commit 60b2f8a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,14 +3,16 @@ sudo: false
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
   - ruby-head
   - jruby-1.7.20
   - jruby-9.0.5.0
+  - jruby-9.1.0.0
   - jruby-head
   - rbx-2
+  - rbx-3
 before_install:
   - gem update bundler --no-document
 before_script:
@@ -20,6 +22,8 @@ matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
+    - rvm: rbx-2
+    - rvm: rbx-3
 notifications:
   email:
   - [email protected]
diff --git a/lib/rake/contrib/.document b/lib/rake/contrib/.document