Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jan Høydahl 2014-11-04 22:27:07 +00:00
parent 9014bb342d
commit 2f1493339e
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
solr/CHANGES.txt
View File

@ -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 ==================

2
solr/bin/solr
View File

@ -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"

2
solr/bin/solr.cmd
View File

@ -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%