Merge branch 'master' of github.com:elasticsearch/elasticsearch-js into 2.1

docs/api_methods_master.asciidoc

@@ -87,7 +87,6 @@ NOTE: At this time, you must opt into the master API by setting the `apiVersion`
 * <<api-indices-refresh-master,indices.refresh>>
 * <<api-indices-segments-master,indices.segments>>
 * <<api-indices-stats-master,indices.stats>>
-* <<api-indices-status-master,indices.status>>
 * <<api-indices-updatealiases-master,indices.updateAliases>>
 * <<api-indices-validatequery-master,indices.validateQuery>>
 * <<api-nodes-hotthreads-master,nodes.hotThreads>>
@@ -3723,47 +3722,6 @@ Options:::
 
 link:#[back to top]
 
-[[api-indices-status-master]]
-=== `indices.status`
-
-[source,js]
---------
-client.indices.status([params, [callback]])
---------
-
-Get a comprehensive status information of one or more indices.
-
-The default method is `GET` and the usual <<api-conventions,params and return values>> apply. See http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/indices-status.html[the elasticsearch docs] for more about this method.
-
-// no examples
-
-
-==== Params
-
-[horizontal]
-`ignoreUnavailable`::
-`Boolean` -- Whether specified concrete indices should be ignored when unavailable (missing or closed)
-`allowNoIndices`::
-`Boolean` -- Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
-`[expandWildcards=open]`::
-`String` -- Whether to expand wildcard expression to concrete indices that are open, closed or both.
-Options:::
- * `"open"`
- * `"closed"`
-
-`human`::
-`Boolean` -- Whether to return time and byte values in human-readable format.
-`operationThreading`::
-`Anything` -- TODO: ?
-`recovery`::
-`Boolean` -- Return information about shard recovery
-`snapshot`::
-`Boolean` -- TODO: ?
-`index`::
-`String, String[], Boolean` -- A comma-separated list of index names; use `_all` or empty string to perform the operation on all indices
-
-link:#[back to top]
-
 [[api-indices-updatealiases-master]]
 === `indices.updateAliases`
 

grunt/config/run.js

@@ -7,7 +7,7 @@ var esOpts = [
   '-D es.index.store.type=memory',
   '-D es.discovery.zen.ping.multicast.enabled=false',
   '-D es.discovery.zen.ping_timeout=1',
-  '-D es.logger.level=ERROR'
+  '-D es.logger.level=ERROR',
 ];
 
 var utils = require('../utils');
@@ -57,7 +57,7 @@ utils.branches.forEach(function (branch) {
     break;
   case 'master':
   case '1.x':
-    args.push('-Des.node.bench=true');
+    args.push('-Des.node.bench=true', '-Des.script.disable_dynamic=false');
     break;
   }
 

src/lib/apis/master.js

@@ -3530,67 +3530,6 @@ api.indices.prototype.stats = ca({
   ]
 });
 
-/**
- * Perform a [indices.status](http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/indices-status.html) request
- *
- * @param {Object} params - An object with parameters used to carry out this action
- * @param {Boolean} params.ignoreUnavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
- * @param {Boolean} params.allowNoIndices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
- * @param {String} [params.expandWildcards=open] - Whether to expand wildcard expression to concrete indices that are open, closed or both.
- * @param {Boolean} params.human - Whether to return time and byte values in human-readable format.
- * @param {Anything} params.operationThreading - TODO: ?
- * @param {Boolean} params.recovery - Return information about shard recovery
- * @param {Boolean} params.snapshot - TODO: ?
- * @param {String, String[], Boolean} params.index - A comma-separated list of index names; use `_all` or empty string to perform the operation on all indices
- */
-api.indices.prototype.status = ca({
-  params: {
-    ignoreUnavailable: {
-      type: 'boolean',
-      name: 'ignore_unavailable'
-    },
-    allowNoIndices: {
-      type: 'boolean',
-      name: 'allow_no_indices'
-    },
-    expandWildcards: {
-      type: 'enum',
-      'default': 'open',
-      options: [
-        'open',
-        'closed'
-      ],
-      name: 'expand_wildcards'
-    },
-    human: {
-      type: 'boolean',
-      'default': false
-    },
-    operationThreading: {
-      name: 'operation_threading'
-    },
-    recovery: {
-      type: 'boolean'
-    },
-    snapshot: {
-      type: 'boolean'
-    }
-  },
-  urls: [
-    {
-      fmt: '/<%=index%>/_status',
-      req: {
-        index: {
-          type: 'list'
-        }
-      }
-    },
-    {
-      fmt: '/_status'
-    }
-  ]
-});
-
 /**
  * Perform a [indices.updateAliases](http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/indices-aliases.html) request
  *