Merge branch 'master' into 3.0

CHANGELOG.md

@@ -1,5 +1,8 @@
 # elasticsearch-js changelog
 
+## 3.1 (Jan 6 2015)
+ - Added HTTPS/SSL configuration options and related errors
+
 ## 3.0 (Nov 7 2014)
  - Added apiVersion `"1.4"`, which is now the default
  - Improved parsing of `host:` strings, [examples in the tests](https://github.com/elasticsearch/elasticsearch-js/blob/165b7d7986b2184b2e4b73d33bf5803e61ce7a54/test/unit/specs/host.js#L71-L92)

README.md

@@ -2,8 +2,8 @@
 
 The official low-level Elasticsearch client for Node.js and the browser.
 
-[![Build Status](http://img.shields.io/travis/elasticsearch/elasticsearch-js/2.4.svg?style=flat-square)](https://travis-ci.org/elasticsearch/elasticsearch-js?branch=3.0)
-[![Coverage Status](http://img.shields.io/coveralls/elasticsearch/elasticsearch-js/2.4.svg?style=flat-square)](https://coveralls.io/r/elasticsearch/elasticsearch-js?branch=3.0)
+[![Build Status](http://img.shields.io/travis/elasticsearch/elasticsearch-js/2.4.svg?style=flat-square)](https://travis-ci.org/elasticsearch/elasticsearch-js?branch=3.1)
+[![Coverage Status](http://img.shields.io/coveralls/elasticsearch/elasticsearch-js/2.4.svg?style=flat-square)](https://coveralls.io/r/elasticsearch/elasticsearch-js?branch=3.1)
 [![Dependencies up to date](http://img.shields.io/david/elasticsearch/elasticsearch-js.svg?style=flat-square)](https://david-dm.org/elasticsearch/elasticsearch-js)
 
 ## Features
@@ -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.0.2.zip">zip</a>
+<a href="https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-3.1.0.zip">zip</a>
 </td>
 <td align="center">
-<a href="https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-3.0.2.tar.gz">tar.gz</a>
+<a href="https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-3.1.0.tar.gz">tar.gz</a>
 </td>
 </tr>
 </table>

docs/browser_builds.asciidoc

@@ -14,7 +14,7 @@ bower install elasticsearch
 ---------
 
 === Download
- * v3.0.2: https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-3.0.2.zip[zip], https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-3.0.2.tar.gz[tar.gz]
+ * 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]
 
 
 === 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.0.2",
+  "version": "3.1.0",
   "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

@@ -138,7 +138,7 @@ _.each(statusCodes, function (name, status) {
   var className = _.studlyCase(name);
 
   function StatusCodeError(msg) {
-    ErrorAbstract.call(this, msg || name, errors[className]);
+    ErrorAbstract.call(this, msg || name, StatusCodeError);
   }
 
   _.inherits(StatusCodeError, ErrorAbstract);