Skip to content

Commit

Permalink
Merge pull request #7313 from elastic/jasper/backport/7212/4.4
Browse files Browse the repository at this point in the history
[backport] PR #7212 to 4.4
  • Loading branch information
jbudz committed May 27, 2016
2 parents 4f93d93 + 5d294d7 commit f6b03cc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion docs/kibana-yml.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ authority for your Elasticsearch instance.
to `false`.
`elasticsearch.pingTimeout:`:: *Default: the value of the `elasticsearch.requestTimeout` setting* Time in milliseconds to
wait for Elasticsearch to respond to pings.
`elasticsearch.requestTimeout:`:: *Default: 300000* Time in milliseconds to wait for responses from the back end or
`elasticsearch.requestTimeout:`:: *Default: 30000* Time in milliseconds to wait for responses from the back end or
Elasticsearch. This value must be a positive integer.
`elasticsearch.shardTimeout:`:: *Default: 0* Time in milliseconds for Elasticsearch to wait for responses from shards. Set
to 0 to disable.
Expand Down

0 comments on commit f6b03cc

Please sign in to comment.