lib/elasticsearch/api/actions/bulk.rb in elasticsearch-api-0.4.1 vs lib/elasticsearch/api/actions/bulk.rb in elasticsearch-api-0.4.2

@@ -31,27 +31,30 @@
       #                   params: { value: 42 }, upsert: { counter: 0 } }
       #                  }}
       #
       #     ]
       #
-      # @option arguments [String] :index Default index for items which don't provide one
-      # @option arguments [String] :type Default document type for items which don't provide one
+      # @option arguments [String]      :index Default index for items which don't provide one
+      # @option arguments [String]      :type Default document type for items which don't provide one
       # @option arguments [Array<Hash>] :body An array of operations to perform, each operation is a Hash
-      # @option arguments [String] :consistency Explicit write consistency setting for the operation (options: one, quorum, all)
+      # @option arguments [String]  :consistency Explicit write consistency setting for the operation
+      #                             (options: one, quorum, all)
       # @option arguments [Boolean] :refresh Refresh the index after performing the operation
-      # @option arguments [String] :replication Explicitely set the replication type (options: sync, async)
-      # @option arguments [String] :type Default document type for items which don't provide one
+      # @option arguments [String]  :replication Explicitely set the replication type (options: sync, async)
+      # @option arguments [String]  :type Default document type for items which don't provide one
+      # @option arguments [Time]    :timeout Explicit operation timeout
       #
       # @return [Hash] Deserialized Elasticsearch response
       #
       # @see http://elasticsearch.org/guide/reference/api/bulk/
       #
       def bulk(arguments={})
         valid_params = [
           :consistency,
           :refresh,
           :replication,
-          :type ]
+          :type,
+          :timeout ]
 
         method = 'POST'
         path   = Utils.__pathify Utils.__escape(arguments[:index]), Utils.__escape(arguments[:type]), '_bulk'
 
         params = Utils.__validate_and_extract_params arguments, valid_params