Merge branch 'master' into 1.5

This commit is contained in:
Spencer Alger
2014-03-03 11:12:02 -07:00
15 changed files with 198 additions and 127 deletions

View File

@ -12,10 +12,12 @@ client.deleteByQuery({
.Deleting documents using the Query DSL
[source,js]
---------
client.delete_by_query({
client.deleteByQuery({
index: 'posts',
body: {
term: { published: false }
query: {
term: { published: false }
}
}
}, function (error, response) {
// ...

View File

@ -402,10 +402,12 @@ client.deleteByQuery({
.Deleting documents using the Query DSL
[source,js]
---------
client.delete_by_query({
client.deleteByQuery({
index: 'posts',
body: {
term: { published: false }
query: {
term: { published: false }
}
}
}, function (error, response) {
// ...

View File

@ -484,10 +484,12 @@ client.deleteByQuery({
.Deleting documents using the Query DSL
[source,js]
---------
client.delete_by_query({
client.deleteByQuery({
index: 'posts',
body: {
term: { published: false }
query: {
term: { published: false }
}
}
}, function (error, response) {
// ...

View File

@ -484,10 +484,12 @@ client.deleteByQuery({
.Deleting documents using the Query DSL
[source,js]
---------
client.delete_by_query({
client.deleteByQuery({
index: 'posts',
body: {
term: { published: false }
query: {
term: { published: false }
}
}
}, function (error, response) {
// ...
@ -2314,6 +2316,8 @@ The default method is `POST` and the usual <<api-conventions,params and return v
[horizontal]
`dryRun`::
`Boolean` -- Simulate the operation only and return the resulting state
`explain`::
`Boolean` -- Return an explanation of why the commands can or cannot be executed
`filterMetadata`::
`Boolean` -- Don't return cluster state metadata (default: false)
`masterTimeout`::

View File

@ -484,10 +484,12 @@ client.deleteByQuery({
.Deleting documents using the Query DSL
[source,js]
---------
client.delete_by_query({
client.deleteByQuery({
index: 'posts',
body: {
term: { published: false }
query: {
term: { published: false }
}
}
}, function (error, response) {
// ...
@ -2314,6 +2316,8 @@ The default method is `POST` and the usual <<api-conventions,params and return v
[horizontal]
`dryRun`::
`Boolean` -- Simulate the operation only and return the resulting state
`explain`::
`Boolean` -- Return an explanation of why the commands can or cannot be executed
`filterMetadata`::
`Boolean` -- Don't return cluster state metadata (default: false)
`masterTimeout`::