From 8c251588b530acebf2e774f6ad2ee80a00152781 Mon Sep 17 00:00:00 2001 From: Todd Ogin Date: Wed, 7 Jan 2015 15:22:16 -0500 Subject: [PATCH 1/5] Update host.asciidoc This bit me when I changed from the string parameter to a regular parameter. --- docs/host.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/host.asciidoc b/docs/host.asciidoc index bbe5f5f27..98bc353c8 100644 --- a/docs/host.asciidoc +++ b/docs/host.asciidoc @@ -15,7 +15,7 @@ Params can either be URL string, or an object with the following properties Default ::: `"localhost"` `port`:: -`Number` -- The port number to use for this host +`Number` -- The port number to use for this host. Note the default of 9200 is only true if the params are passed as an object. If a string, then default port is evaluated based on the protocol (`80` for http, `443` for https). Default ::: `9200` @@ -102,4 +102,4 @@ var client = new elasticsearch.Client({ return selection; } }); ------ \ No newline at end of file +----- From 27060bfb7170f34eef29ef0b7f97521dc4999092 Mon Sep 17 00:00:00 2001 From: Spencer Alger Date: Mon, 2 Feb 2015 11:58:04 -0700 Subject: [PATCH 2/5] version 3.1.2 --- README.md | 4 ++-- docs/browser_builds.asciidoc | 2 +- package.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 93a9dc03a..19f6a9c57 100644 --- a/README.md +++ b/README.md @@ -34,10 +34,10 @@ Check out the [Browser Builds](http://www.elasticsearch.org/guide/en/elasticsear download: -zip +zip -tar.gz +tar.gz diff --git a/docs/browser_builds.asciidoc b/docs/browser_builds.asciidoc index b914a9185..9ceccce93 100644 --- a/docs/browser_builds.asciidoc +++ b/docs/browser_builds.asciidoc @@ -14,7 +14,7 @@ bower install elasticsearch --------- === Download - * v3.1.1: https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-3.1.1.zip[zip], https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-3.1.1.tar.gz[tar.gz] + * v3.1.2: https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-3.1.2.zip[zip], https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-3.1.2.tar.gz[tar.gz] === Angular Build diff --git a/package.json b/package.json index 289ee8aea..bb50a8d17 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "description": "The official low-level Elasticsearch client for Node.js and the browser.", "main": "src/elasticsearch.js", "homepage": "http://www.elasticsearch.org/guide/en/elasticsearch/client/javascript-api/current/index.html", - "version": "3.1.1", + "version": "3.1.2", "browser": { "./src/lib/connectors/index.js": "./src/lib/connectors/browser_index.js", "./src/lib/loggers/index.js": "./src/lib/loggers/browser_index.js", @@ -96,4 +96,4 @@ "engines": { "node": ">=0.8 <0.11" } -} +} \ No newline at end of file From b38a02f7f2a11a4130faecc73ad2d87a7b77c82f Mon Sep 17 00:00:00 2001 From: Spencer Alger Date: Mon, 2 Feb 2015 12:00:11 -0700 Subject: [PATCH 3/5] added .esvm to npmignore --- .npmignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.npmignore b/.npmignore index d84e99b35..413d154c1 100644 --- a/.npmignore +++ b/.npmignore @@ -6,6 +6,7 @@ scripts/scratch* test/integration/yaml_suite/log .aws-config.json .idea +.esvm ## generated files test/integration/yaml_suite/yaml_tests*.json From b4025624d3dc08856c255847e446f8b3927a1f21 Mon Sep 17 00:00:00 2001 From: Spencer Alger Date: Mon, 2 Feb 2015 12:06:46 -0700 Subject: [PATCH 4/5] updated changelog for 3.1.2 release --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1c3ac155..536e99ef6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ## 3.1 (Jan 6 2015) - Added HTTPS/SSL configuration options and related errors - `client.scroll()` requests made without a body will use the `scrollId` param as the body to prevent #113 & #174 + - Updated bluebird to `v2.8.2` - [bluebird changelog](https://github.com/petkaantonov/bluebird/blob/master/changelog.md) + - Added specific error message for 504 errors [#182](https://github.com/elasticsearch/elasticsearch-js/pull/182) ## 3.0 (Nov 7 2014) - Added apiVersion `"1.4"`, which is now the default From 5c563abf64b6bedc8875dda36dfdbc8c4d80e7ec Mon Sep 17 00:00:00 2001 From: Spencer Alger Date: Mon, 2 Feb 2015 12:25:45 -0700 Subject: [PATCH 5/5] version 3.1.3 --- README.md | 4 ++-- docs/browser_builds.asciidoc | 2 +- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 19f6a9c57..5a2d847c1 100644 --- a/README.md +++ b/README.md @@ -34,10 +34,10 @@ Check out the [Browser Builds](http://www.elasticsearch.org/guide/en/elasticsear download: -zip +zip -tar.gz +tar.gz diff --git a/docs/browser_builds.asciidoc b/docs/browser_builds.asciidoc index 9ceccce93..7bc0dbb45 100644 --- a/docs/browser_builds.asciidoc +++ b/docs/browser_builds.asciidoc @@ -14,7 +14,7 @@ bower install elasticsearch --------- === Download - * v3.1.2: https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-3.1.2.zip[zip], https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-3.1.2.tar.gz[tar.gz] + * v3.1.3: https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-3.1.3.zip[zip], https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-3.1.3.tar.gz[tar.gz] === Angular Build diff --git a/package.json b/package.json index 1914856bd..bfb5bec0e 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "description": "The official low-level Elasticsearch client for Node.js and the browser.", "main": "src/elasticsearch.js", "homepage": "http://www.elasticsearch.org/guide/en/elasticsearch/client/javascript-api/current/index.html", - "version": "3.1.2", + "version": "3.1.3", "browser": { "./src/lib/connectors/index.js": "./src/lib/connectors/browser_index.js", "./src/lib/loggers/index.js": "./src/lib/loggers/browser_index.js",