Merge branch 'master' of https://github.com/google/google-api-ruby-client

2013-04-18 20:57:32 -07:00 · 2013-04-18 20:57:32 -07:00 · 0e1ac4ea6a
parent 4241e2c99e e2991a0fa5
commit 0e1ac4ea6a
2 changed files with 6 additions and 5 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -4,7 +4,11 @@ rvm:
  - 1.9.2
  - 1.9.3
  - 2.0.0
-  - jruby
+  - rbx-18mode
+  - rbx-19mode
+  - jruby-18mode
+  - jruby-19mode
+  - jruby-20mode
  - ree
 script: "bundle exec rake spec:all"
 before_install:
@ -16,6 +20,3 @@ notifications:
      - sbazyl@google.com
    on_success: change
    on_failure: change
-matrix:
-  allow_failures:
-    - rvm: 2.0.0
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'

 gemspec