Merge pull request #467 from sodabrew/ruby_21

Travis update and spec workaround for Ruby 2.1

Author: sodabrew

.travis.yml

@@ -4,12 +4,9 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1.0-preview2
+  - 2.1.0
   - ree
   - rbx
-matrix:
-  allow_failures:
-    - rvm: 2.1.0-preview2
 env: RBXOPT=-Xgc.honor_start=true
 bundler_args: --without benchmarks
 script:

spec/mysql2/client_spec.rb

@@ -396,6 +396,7 @@ def connect *args
       end
 
       it "should close the connection when an exception is raised" do
+        pending "Ruby 2.1 has changed Timeout behavior." if RUBY_VERSION =~ /2.1/
         begin
           Timeout.timeout(1) do
             @client.query("SELECT sleep(2)")
@@ -409,6 +410,7 @@ def connect *args
       end
 
       it "should handle Timeouts without leaving the connection hanging if reconnect is true" do
+        pending "Ruby 2.1 has changed Timeout behavior." if RUBY_VERSION =~ /2.1/
         client = Mysql2::Client.new(DatabaseCredentials['root'].merge(:reconnect => true))
         begin
           Timeout.timeout(1) do
@@ -423,6 +425,7 @@ def connect *args
       end
 
       it "should handle Timeouts without leaving the connection hanging if reconnect is set to true after construction true" do
+        pending "Ruby 2.1 has changed Timeout behavior." if RUBY_VERSION =~ /2.1/
         client = Mysql2::Client.new(DatabaseCredentials['root'])
         begin
           Timeout.timeout(1) do