Merge pull request #7 from mchristopher/master

Nathan Sutton · Nathan Sutton · commit 04ebc9e4c386 · 2012-07-16T23:41:28.000-07:00
Updates the default timeout to match service's timeout.
diff --git a/lib/zencoder/http.rb b/lib/zencoder/http.rb
@@ -13,7 +13,7 @@ class << self
 
     self.http_backend = NetHTTP
 
-    self.default_options = {:timeout => 10000,
+    self.default_options = {:timeout => 60000,
                             :headers => {'Accept'       => 'application/json',
                                          'Content-Type' => 'application/json',
                                          'User-Agent'   => "Zencoder-rb v#{Zencoder::GEM_VERSION}"}}
