Merge pull request #5660 from spalger/upgrade/elasticsearch/4.x

Upgrade elasticsearch to 2.x branch

docs/setup.asciidoc

@@ -2,8 +2,7 @@
 == Getting Kibana Up and Running
 You can set up Kibana and start exploring your Elasticsearch indices in minutes.
 All you need is:
-
-* Elasticsearch 2.1 or later
+* Elasticsearch 2.x or later
 * A modern web browser - http://www.elastic.co/subscriptions/matrix#matrix_browsers[Supported Browsers].
 * Information about your Elasticsearch installation:
 ** URL of the Elasticsearch instance you want to connect to.
@@ -82,8 +81,8 @@ simply be the name of a single index.
 reads the index mapping to list all of the fields that contain a timestamp. If your index doesn't have time-based data,
 disable the *Index contains time-based events* option.
 +
-WARNING: Using event times to create index names is *deprecated* in this release of Kibana. Support for this functionality 
-will be removed entirely in the next major Kibana release. Elasticsearch 2.1 includes sophisticated date parsing APIs that 
+WARNING: Using event times to create index names is *deprecated* in this release of Kibana. Support for this functionality
+will be removed entirely in the next major Kibana release. Elasticsearch 2.1 includes sophisticated date parsing APIs that
 Kibana uses to determine date information, removing the need to specify dates in the index pattern name.
 +
 . Click *Create* to add the index pattern. This first pattern is automatically configured as the default.

tasks/config/esvm.js

@@ -6,7 +6,7 @@ module.exports = function (grunt) {
 
   return {
     options: {
-      branch: '2.1',
+      branch: '2.x',
       fresh: !grunt.option('esvm-no-fresh'),
       config: {
         network: {