From 5755115cc6c8fe75f1e62ddb0cd9dc99d949495d Mon Sep 17 00:00:00 2001 From: Rahul Patel Date: Sat, 19 Jul 2014 14:19:31 +0100 Subject: [PATCH 1/4] Adding esq as an alternative to elastic.js --- docs/_descriptions/search.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_descriptions/search.asciidoc b/docs/_descriptions/search.asciidoc index ac4959560..201fad764 100644 --- a/docs/_descriptions/search.asciidoc +++ b/docs/_descriptions/search.asciidoc @@ -1,4 +1,4 @@ Return documents matching a query, aggregations/facets, highlighted snippets, suggestions, and more. Write your queries as either http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-uri-request.html[simple query strings] in the `q` parameter, or by specifying a http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-body.html[full request definition] using the http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl.html[Elasticsearch Query DSL] in the `body` parameter. -TIP: https://github.com/fullscale/elastic.js[elastic.js] can be used to make building query bodies easier. +TIP: https://github.com/fullscale/elastic.js[elastic.js] or https://github.com/holidayextras/esq[esq] can be used to make building query bodies easier. From 838cfe8cf653d5eb26cd876ff13e2f778a3a225d Mon Sep 17 00:00:00 2001 From: vzvenyach Date: Fri, 25 Jul 2014 21:41:39 -0400 Subject: [PATCH 2/4] Update quick_start.asciidoc typo --- docs/quick_start.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/quick_start.asciidoc b/docs/quick_start.asciidoc index 06f1794eb..04a199055 100644 --- a/docs/quick_start.asciidoc +++ b/docs/quick_start.asciidoc @@ -2,7 +2,7 @@ == Quick Start === Creating a client -Start using Elasticsearch.js by creating an instance of the `elasticsearch.Client` class. The constructor accepts a config object/hash where you can define defaults values, or even entire classes, for the client to use. For a full list of config options check out the the <>. +Start using Elasticsearch.js by creating an instance of the `elasticsearch.Client` class. The constructor accepts a config object/hash where you can define defaults values, or even entire classes, for the client to use. For a full list of config options check out the the <>. [source,js] ----------------- From 34b8bd876765c9cbd6395a281a3f420bd9f43181 Mon Sep 17 00:00:00 2001 From: Spencer Alger Date: Wed, 30 Jul 2014 11:51:00 -0700 Subject: [PATCH 3/4] run tests against 1.3 on travis --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b8d23e32d..f35fb1707 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,8 @@ language: node_js node_js: "0.10" secure: "UFAGQ6m/VnEahbj9vttY9YoA5h5rEBE6K7AvEEbWnt+VKppV+w3hu3HZxgKr8C9PWhCzqlGvsLh+kCqykZhISU1fBCK/Ttp3nSpMvvF5tI2u51Rj1qZ/7NUGRU0qVI9KFt0rJeXMJwq3fivb1H6aojfPD1gsIte7NHNjUfd0iUg=" env: - - ES_BRANCH=1.2 ES_RELEASE=1.2.2 COVERAGE=1 + - ES_BRANCH=1.3 ES_RELEASE=1.3.1 COVERAGE=1 + - ES_BRANCH=1.2 ES_RELEASE=1.2.3 NODE_UNIT=0 - ES_BRANCH=1.1 ES_RELEASE=1.1.2 NODE_UNIT=0 - ES_BRANCH=1.0 ES_RELEASE=1.0.3 NODE_UNIT=0 - ES_BRANCH=0.90 ES_RELEASE=0.90.13 NODE_UNIT=0 From b158339d99729064f97fa077c7e8b966a9baf753 Mon Sep 17 00:00:00 2001 From: Spencer Alger Date: Wed, 30 Jul 2014 14:51:43 -0700 Subject: [PATCH 4/4] added 1.2 api to the doc index --- docs/index.asciidoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/index.asciidoc b/docs/index.asciidoc index 205af7125..ce2db8870 100644 --- a/docs/index.asciidoc +++ b/docs/index.asciidoc @@ -18,6 +18,8 @@ include::development.asciidoc[] include::api_methods.asciidoc[] +include::api_methods_1_2.asciidoc[] + include::api_methods_1_1.asciidoc[] include::api_methods_1_0.asciidoc[]