Merge branch '3.1' of https://github.com/elasticsearch/elasticsearch-js

.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

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

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.1.zip">zip</a>
+<a href="https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-3.1.3.zip">zip</a>
 </td>
 <td align="center">
-<a href="https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-3.1.1.tar.gz">tar.gz</a>
+<a href="https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-3.1.3.tar.gz">tar.gz</a>
 </td>
 </tr>
 </table>

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.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

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;
   }
 });
------
+-----

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.3",
   "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"
   }
-}
+}