Merge branch '1.0' of https://github.com/lostisland/faraday into feat…

…ure/#762-rspec

# Conflicts:
#	test/adapters/net_http_persistent_test.rb

README.md

@@ -288,7 +288,7 @@ end
 ### NetHttpPersistent
 ```ruby
 conn = Faraday.new(...) do |f|
-  f.adapter :net_http_persistent do |http| # yields Net::HTTP::Persistent
+  f.adapter :net_http_persistent, pool_size: 5 do |http| # yields Net::HTTP::Persistent
     http.idle_timeout = 100
     http.retry_change_requests = true
   end

lib/faraday/adapter/net_http_persistent.rb

@@ -9,7 +9,9 @@ class NetHttpPersistent < NetHttp
       def net_http_connection(env)
         @cached_connection ||=
           if Net::HTTP::Persistent.instance_method(:initialize).parameters.first == [:key, :name]
-            Net::HTTP::Persistent.new(name: 'Faraday')
+            options = {name: 'Faraday'}
+            options[:pool_size] = @connection_options[:pool_size] if @connection_options.key?(:pool_size)
+            Net::HTTP::Persistent.new(options)
           else
             Net::HTTP::Persistent.new('Faraday')
           end