From 5e5b7e12ea5f13ebfa638adca80fe863ac4b8863 Mon Sep 17 00:00:00 2001 From: Spencer Alger Date: Wed, 7 Jan 2015 05:49:04 -0700 Subject: [PATCH 1/2] version 3.1.1 --- CHANGELOG.md | 1 + README.md | 4 ++-- docs/browser_builds.asciidoc | 2 +- package.json | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f54be884f..b1c3ac155 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 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 ## 3.0 (Nov 7 2014) - Added apiVersion `"1.4"`, which is now the default diff --git a/README.md b/README.md index 43f885a21..93a9dc03a 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 b76ff983f..b914a9185 100644 --- a/docs/browser_builds.asciidoc +++ b/docs/browser_builds.asciidoc @@ -14,7 +14,7 @@ bower install elasticsearch --------- === Download - * v3.1.0: https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-3.1.0.zip[zip], https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-3.1.0.tar.gz[tar.gz] + * 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] === Angular Build diff --git a/package.json b/package.json index 0207ea24c..d8bcf0e27 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.0", + "version": "3.1.1", "browser": { "./src/lib/connectors/index.js": "./src/lib/connectors/browser_index.js", "./src/lib/loggers/index.js": "./src/lib/loggers/browser_index.js", From c9729539623ac6bed7c3e47010723c03ad06a84d Mon Sep 17 00:00:00 2001 From: lukasolson Date: Wed, 21 Jan 2015 15:40:42 -0700 Subject: [PATCH 2/2] Add 504 error handling and update contributing guide --- CONTRIBUTING.md | 2 +- src/lib/errors.js | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8c08bc74d..ae91846ec 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -33,7 +33,7 @@ Please write test cases to exercise your changes. Or to skip the integration tests: ```sh - grunt test_unit + grunt unit_test ``` 4. Optionally, run the browser tests. While this step is automated and simple, it can take several minutes for the tests to complete. Unless you are making changes to browser specific portions of the code you can probably let Travis run the browser tests for you. diff --git a/src/lib/errors.js b/src/lib/errors.js index 685ff1bf2..dda9b5311 100644 --- a/src/lib/errors.js +++ b/src/lib/errors.js @@ -79,6 +79,12 @@ _.inherits(errors.RequestTypeError, ErrorAbstract); var statusCodes = { + /** + * GatewayTimeout + * @param {String} [msg] - An error message that will probably end up in a log. + */ + 504: 'Gateway Timeout', + /** * ServiceUnavailable * @param {String} [msg] - An error message that will probably end up in a log.