added 1.6 apis

.travis.yml

@@ -4,9 +4,9 @@ node_js:
   - "iojs"
 secure: "UFAGQ6m/VnEahbj9vttY9YoA5h5rEBE6K7AvEEbWnt+VKppV+w3hu3HZxgKr8C9PWhCzqlGvsLh+kCqykZhISU1fBCK/Ttp3nSpMvvF5tI2u51Rj1qZ/7NUGRU0qVI9KFt0rJeXMJwq3fivb1H6aojfPD1gsIte7NHNjUfd0iUg="
 env:
+  - ES_RELEASE=1.5.2 RUN=NODE_INTEGRATION
+  - ES_RELEASE=1.5.2 RUN=NODE_UNIT,CHECK_COVERAGE,SAUCE_LABS
   - ES_RELEASE=1.4.4 RUN=NODE_INTEGRATION
-  - ES_RELEASE=1.4.4 RUN=NODE_UNIT,CHECK_COVERAGE,SAUCE_LABS
-  - ES_RELEASE=1.3.9 RUN=NODE_INTEGRATION
 script: node ./scripts/ci.js
 email:
   recipients:

CHANGELOG.md

@@ -1,5 +1,12 @@
 # elasticsearch-js changelog
 
+## 5.0 (Jun...)
+ - Added apiVersion `"1.6"`, which is now the default
+
+## 4.1 (May 19 2015)
+ - Plugin configuration option added
+ - Added support for object based error
+
 ## 4.0 (Mar 26 2015)
  - Added apiVersion `"1.5"`, which is now the default
  - Changed the default pingTimeout to 3 seconds, and made it configurable

grunt/config/esvm.js

@@ -35,6 +35,7 @@ function setConfig(ref, target) {
   case '1.3':
   case '1.4':
   case '1.5':
+  case '1.6':
   case '1.x':
     target.options.config = _.merge({
       'node.bench': true,

package.json

@@ -20,6 +20,7 @@
       "pattern": "specified in test/unit/coverage.js"
     },
     "supported_es_branches": [
+      "1.6",
       "1.5",
       "1.4",
       "1.3",
@@ -32,7 +33,7 @@
       "master",
       "1.x"
     ],
-    "default_api_branch": "1.5"
+    "default_api_branch": "1.6"
   },
   "devDependencies": {
     "aliasify": "~1.2.4",

src/lib/apis/browser_index.js

@@ -1,5 +1,5 @@
 module.exports = {
+  '1.6': require('./1_6'),
   '1.5': require('./1_5'),
-  '1.4': require('./1_4'),
-  '1.3': require('./1_3')
+  '1.4': require('./1_4')
 };

src/lib/apis/index.js

@@ -1,6 +1,7 @@
 module.exports = {
   'master': require('./master'),
   '1.x': require('./1_x'),
+  '1.6': require('./1_6'),
   '1.5': require('./1_5'),
   '1.4': require('./1_4'),
   '1.3': require('./1_3'),

src/lib/client.js

@@ -66,7 +66,7 @@ function Client(config) {
   }
 
 
-  EsApiClient.prototype = _.funcEnum(config, 'apiVersion', Client.apis, '1.5');
+  EsApiClient.prototype = _.funcEnum(config, 'apiVersion', Client.apis, '1.6');
   if (!config.sniffEndpoint && EsApiClient.prototype === Client.apis['0.90']) {
     config.sniffEndpoint = '/_cluster/nodes';
   }