Merge pull request #488 from mesos/refactor/475-RemoveExecutor

[WAIT] Remove executor and use official ES image

build.gradle

@@ -4,10 +4,11 @@ import com.bmuschko.gradle.docker.tasks.image.DockerTagImage
 import com.github.zafarkhaja.semver.UnexpectedCharacterException
 import com.github.zafarkhaja.semver.Version
 import org.ajoberstar.grgit.Grgit
+import org.ajoberstar.grgit.Tag
 
 ext {
     mesosVer = "0.25.0"
-    elasticsearchVersion="2.1.1"
+    elasticsearchVersion="2.2.0"
     imagePrefix = 'mesos'
     springBootVersion = "1.2.5.RELEASE"
 }
@@ -36,8 +37,6 @@ buildscript {
   }
 }
 
-import org.ajoberstar.grgit.Tag
-
 def grgit = Grgit.open(project.file('.'))
 def tags = grgit.tag.list()
 def versions = []

commons/src/main/java/org/apache/mesos/elasticsearch/common/cli/ElasticsearchCLIParameter.java

@@ -22,9 +22,6 @@ public String getElasticsearchClusterName() {
             validateWith = CLIValidators.NotEmptyString.class)
     private String elasticsearchSettingsLocation = "";
     public String getElasticsearchSettingsLocation() {
-        if (elasticsearchSettingsLocation.equals("DEFAULT")) {
-            elasticsearchSettingsLocation = "";
-        }
         return elasticsearchSettingsLocation;
     }
 

commons/src/test/java/org/apache/mesos/elasticsearch/common/zookeeper/formatter/MesosZKFormatterTest.java

@@ -9,7 +9,7 @@
 import java.util.Collections;
 
 import static java.util.Arrays.asList;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.when;
 
 /**

docs/index.md

@@ -63,13 +63,8 @@
 
 ### User tools
 
-- One click DCOS install ✓
 - One JSON post to marathon install ✓
 
-### Certification
-
-- DCOS Certified
-
 ## Getting Started
 
 We recommend that users install via marathon, using a docker container.
@@ -156,19 +151,13 @@ Usage: (Options preceded by an asterisk are required) [options]
     --executorForcePullImage
        Option to force pull the executor image. [DOCKER MODE ONLY]
        Default: false
-    --executorHealthDelay
-       The delay between executor healthcheck requests (ms).
-       Default: 30000
     --executorImage
-       The docker executor image to use. [DOCKER MODE ONLY]
-       Default: mesos/elasticsearch-executor
+       The docker executor image to use. E.g. 'elasticsearch:latest' [DOCKER
+       MODE ONLY]
+       Default: elasticsearch:latest
     --executorName
        The name given to the executor task.
        Default: elasticsearch-executor
-    --executorTimeout
-       The maximum executor healthcheck timeout (ms). Must be greater than
-       --executorHealthDelay. Will start new executor after this length of time.
-       Default: 60000
     --frameworkFailoverTimeout
        The time before Mesos kills a scheduler and tasks if it has not recovered
        (ms).