From 2f1493339e15a93190cc24231e2c49d83ca0965c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= <janhoy@apache.org>
Date: Tue, 4 Nov 2014 22:27:07 +0000
Subject: [PATCH] SOLR-6696: bin/solr start script should not enable
 autoSoftCommit by default

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1636760 13f79535-47bb-0310-9956-ffa450edef68
---
 solr/CHANGES.txt  | 4 ++++
 solr/bin/solr     | 2 +-
 solr/bin/solr.cmd | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index f958a12dc0e..e342b0c266c 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -356,6 +356,10 @@ Other Changes
 
 ==================  4.10.3 ==================
 
+Bug Fixes
+----------------------
+
+* SOLR-6696: bin/solr start script should not enable autoSoftCommit by default (janhoy)
 
 ==================  4.10.2 ==================
 
diff --git a/solr/bin/solr b/solr/bin/solr
index 0d5e54a4e03..77afa860abf 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -1023,7 +1023,7 @@ $SOLR_HOST_ARG -Djetty.port=$SOLR_PORT \
 -Dsolr.solr.home=$SOLR_HOME \
 -Dsolr.install.dir=$SOLR_TIP \
 -Duser.timezone=$SOLR_TIMEZONE \
--Djava.net.preferIPv4Stack=true -Dsolr.autoSoftCommit.maxTime=3000"
+-Djava.net.preferIPv4Stack=true"
   
   if [ "$SOLR_MODE" == "solrcloud" ]; then
     IN_CLOUD_MODE=" in SolrCloud mode"
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index ea47cd9e9c3..e35a5bd9bc5 100644
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -619,7 +619,7 @@ IF "%verbose%"=="1" (
     @echo     SOLR_TIMEZONE   = %SOLR_TIMEZONE%
 )
 
-set START_OPTS=-Duser.timezone=%SOLR_TIMEZONE% -Djava.net.preferIPv4Stack=true -Dsolr.autoSoftCommit.maxTime=3000
+set START_OPTS=-Duser.timezone=%SOLR_TIMEZONE% -Djava.net.preferIPv4Stack=true
 set START_OPTS=%START_OPTS% %GC_TUNE% %GC_LOG_OPTS%
 IF NOT "!CLOUD_MODE_OPTS!"=="" set START_OPTS=%START_OPTS% !CLOUD_MODE_OPTS!
 IF NOT "%REMOTE_JMX_OPTS%"=="" set START_OPTS=%START_OPTS% %REMOTE_JMX_OPTS%