From 22e39f93c0084644f127b0205efa94238e56538a Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Mon, 5 Jan 2015 12:50:25 -0700
Subject: [PATCH] [tests] stop running es with store.type=memory and
 gateway.type=none

---
 grunt/config/run.js | 2 --
 scripts/_utils.sh   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/grunt/config/run.js b/grunt/config/run.js
index 05081468b..92dc3afa3 100644
--- a/grunt/config/run.js
+++ b/grunt/config/run.js
@@ -3,8 +3,6 @@ var esOpts = [
   '-D es.network.host=localhost',
   '-D es.cluster.name=elasticsearch_js_test_runners',
   '-D es.node.name=elasticsearch_js_test_runner',
-  '-D es.gateway.type=none',
-  '-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',
diff --git a/scripts/_utils.sh b/scripts/_utils.sh
index 0e9a0bdea..0101223ba 100644
--- a/scripts/_utils.sh
+++ b/scripts/_utils.sh
@@ -132,7 +132,7 @@ function manage_es {
           return 1
         fi
 
-        local ES_OPTS="-p $PIDFILE -D es.http.port=9400 -D es.network.host=localhost -D es.cluster.name=elasticsearch_js_test_runners -D es.node.name=elasticsearch_js_test_runner -D es.gateway.type=none -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"
+        local ES_OPTS="-p $PIDFILE -D es.http.port=9400 -D es.network.host=localhost -D es.cluster.name=elasticsearch_js_test_runners -D es.node.name=elasticsearch_js_test_runner -D es.discovery.zen.ping.multicast.enabled=false -D es.discovery.zen.ping_timeout=1 -D es.logger.level=ERROR"
 
         if [ -n "$ES_NODE_NAME" ]; then
           ES_OPTS="$ES_OPTS -Des.node.name=$ES_NODE_NAME"