Merge branch 'lukasolson:add_504' into 'master'

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

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.
 

README.md

@@ -34,10 +34,10 @@ Check out the [Browser Builds](http://www.elasticsearch.org/guide/en/elasticsear
 </tr><tr>
 <td>download:</td>
 <td align="center">
-<a href="https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-3.1.0.zip">zip</a>
+<a href="https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-3.1.1.zip">zip</a>
 </td>
 <td align="center">
-<a href="https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-3.1.0.tar.gz">tar.gz</a>
+<a href="https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-3.1.1.tar.gz">tar.gz</a>
 </td>
 </tr>
 </table>

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

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",

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.