lib/elasticsearch/transport/client.rb in elasticsearch-transport-0.4.11 vs lib/elasticsearch/transport/client.rb in elasticsearch-transport-1.0.0.rc1

- old
+ new

@@ -55,12 +55,10 @@ # @option arguments [Boolean,Number] :retry_on_failure Retry X times when request fails before raising and # exception (false by default) # # @option arguments [Boolean] :reload_on_failure Reload connections after failure (false by default) # - # @option arguments [Hash] :transport_options Options to be passed to the `Faraday::Connection` constructor - # # @option arguments [Constant] :transport_class A specific transport class to use, will be initialized by # the client and passed hosts and all arguments # # @option arguments [Object] :transport A specific transport instance # @@ -78,10 +76,9 @@ arguments[:tracer] ||= arguments[:trace] ? DEFAULT_TRACER.call() : nil arguments[:reload_connections] ||= false arguments[:retry_on_failure] ||= false arguments[:reload_on_failure] ||= false arguments[:randomize_hosts] ||= false - arguments[:transport_options] ||= {} @transport = arguments[:transport] || \ transport_class.new(:hosts => __extract_hosts(hosts, arguments), :options => arguments) end