You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mk...@apache.org on 2016/06/06 20:54:05 UTC
lucene-solr:master: SOLR-8676: keep LOG4J_CONFIG in solr.cmd
Repository: lucene-solr
Updated Branches:
refs/heads/master c2aea1b80 -> 00602a3a7
SOLR-8676: keep LOG4J_CONFIG in solr.cmd
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/00602a3a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/00602a3a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/00602a3a
Branch: refs/heads/master
Commit: 00602a3a7a3f6542ff2993bf6f2fb8f6edbd9c22
Parents: c2aea1b
Author: Mikhail Khludnev <mk...@apache.org>
Authored: Fri Jun 3 01:05:28 2016 +0300
Committer: Mikhail Khludnev <mk...@apache.org>
Committed: Mon Jun 6 23:49:34 2016 +0300
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
solr/bin/solr.cmd | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/00602a3a/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 13e51a2..0c8ebe9 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -253,6 +253,8 @@ Bug Fixes
* SOLR-8612: closing JDBC Statement on failures in DataImportHandler (DIH) (Kristine Jetzke via Mikhail Khludnev)
+* SOLR-8676: keep LOG4J_CONFIG in solr.cmd (Kristine Jetzke via Mikhail Khludnev)
+
Optimizations
----------------------
* SOLR-8722: Don't force a full ZkStateReader refresh on every Overseer operation.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/00602a3a/solr/bin/solr.cmd
----------------------------------------------------------------------
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index a8d71c4..6889bef 100644
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -657,7 +657,6 @@ IF "%STOP_KEY%"=="" set STOP_KEY=solrrocks
@REM so that we can write logs for examples to %SOLR_HOME%\..\logs
set "SOLR_LOGS_DIR=%SOLR_SERVER_DIR%\logs"
set "EXAMPLE_DIR=%SOLR_TIP%\example"
-set LOG4J_CONFIG=
set TMP=!SOLR_HOME:%EXAMPLE_DIR%=!
IF NOT "%TMP%"=="%SOLR_HOME%" (
set "SOLR_LOGS_DIR=%SOLR_HOME%\..\logs"