Skip to content

update 2.1 with changes from master #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
May 19, 2014
Merged

update 2.1 with changes from master #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
17e95f8
moved away from multiple repos, to a single bare repo which we pull t…
Apr 30, 2014
a82f8e1
fixed an issue preventing the API generator from running, and batched…
Apr 30, 2014
caaf3d6
make fetches/clones less shallow
Apr 30, 2014
106bccd
fetch full history, until the current errors are understood
Apr 30, 2014
ee3c68d
Enhancing help message for log generator
simianhacker Apr 30, 2014
36ac7ca
fix lint issues
May 1, 2014
6ca4fca
use long-notation for defining deps in the angular connector
May 2, 2014
611be9d
allow stack traces in the browser
May 2, 2014
dfca8f5
fixed stupidly specific test
May 2, 2014
1e8805a
removed 'unstable' api docs
May 5, 2014
f54826f
updated APIs
May 5, 2014
9a1cfe7
seperated stable and unstable branches so that docs are not generated…
May 5, 2014
c793360
updated mocha and angular.
May 5, 2014
9fdc3e8
Since the `from` property is doing this `from: (pageNum - 1) * perPag…
doowb May 6, 2014
cc6ff36
updated browser_client tasks to only run the build once durring relea…
May 6, 2014
7320325
moved browser-builds section to their own page/file and modified verb…
May 9, 2014
1a383ac
added a new RequestTypeError class that connectionClasses can throw t…
May 9, 2014
007e9ac
quit testing that the unit tests run in ie9
May 9, 2014
6e2f97e
added the cat.fieldata api's
May 9, 2014
f0f14b3
added some complex fields to the log generator
May 13, 2014
37d7877
updated the options/defaults for apiVersion in the configuration docs.
May 19, 2014
512516c
udpated the log generator to pause when there is a bulk queue overflow
May 19, 2014
ac60bfa
Merge remote-tracking branch 'upstream/master' into 2.1
May 19, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ test/integration/yaml_suite/log
## generated files
test/integration/yaml_suite/yaml_tests*.json
test/integration/yaml_suite/index*.js
src/elasticsearch*/
src/_elasticsearch*
src/bower*/
junit-*.xml
elasticsearch*.log
Expand Down
6 changes: 4 additions & 2 deletions docs/api_methods.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>>
Expand Down Expand Up @@ -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`::
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/api_methods_1_0.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading