habsi/elasticsearch-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into 2.1

Browse Source 
Conflicts:
	docs/api_methods_1_x.asciidoc
	docs/browser_builds.asciidoc
This commit is contained in:
Spencer Alger
2014-05-19 10:14:44 -07:00
parent 0bdb424d40 512516c73f
commit ac60bfa7c5
29 changed files with 3654 additions and 31070 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/api_methods.asciidoc
View File

@ -2,7 +2,7 @@
== 1.1 API
NOTE: This is currently the default API, but in upcoming versions that will change. We recommend setting the `apiVersion` config param when you instantiate your client to make sure that the API does not change unexpectedly.
NOTE: This is currently the default API, but in upcomming versions that will change. We recommend setting the `apiVersion` config param when you instantiate your client to make sure that the API does not change unexpectedly.
[[js-api-method-index]]
* <<api-bulk,bulk>>
@ -2523,6 +2523,8 @@ The default method is `POST` and the usual <<api-conventions,params and return v
[horizontal]
`analyzer`::
`String` -- The name of the analyzer to use
`charFilters`::
`String, String[], Boolean` -- A comma-separated list of character filters to use for the analysis
`field`::
`String` -- Use the analyzer configured for this field (instead of passing the analyzer name)
`filters`::
@ -3665,7 +3667,7 @@ client.indices.status([params, [callback]])
Get a comprehensive status information of one or more indices.
The default method is `GET` and the usual <<api-conventions,params and return values>> apply. See http://www.elasticsearch.org/guide/en/elasticsearch/reference/0.90/indices-status.html[the elasticsearch docs] for more about this method.
The default method is `GET` and the usual <<api-conventions,params and return values>> apply. See http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/indices-status.html[the elasticsearch docs] for more about this method.
// no examples

2
docs/api_methods_1_0.asciidoc
View File

@ -3558,7 +3558,7 @@ client.indices.status([params, [callback]])
Get a comprehensive status information of one or more indices.
The default method is `GET` and the usual <<api-conventions,params and return values>> apply. See http://www.elasticsearch.org/guide/en/elasticsearch/reference/0.90/indices-status.html[the elasticsearch docs] for more about this method.
The default method is `GET` and the usual <<api-conventions,params and return values>> apply. See http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/indices-status.html[the elasticsearch docs] for more about this method.
// no examples

4204
docs/api_methods_1_x.asciidoc
View File

File diff suppressed because it is too large Load Diff

4162
docs/api_methods_master.asciidoc
View File

File diff suppressed because it is too large Load Diff

4
docs/configuration.asciidoc
View File

@ -51,10 +51,10 @@ Default in Node:::
+
WARNING: This default will track the latest version of Elasticsearch, and is only intended to be used during development. It is highly recommended that you set this parameter in all code that is headed to production.
Default ::: `"1.0"`
Default ::: `"1.1"`
Options :::
* `"master"`
* `"1.1"`
* `"1.0"`
* `"0.90"`