lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject lucene-solr:branch_6x: SOLR-8676: keep LOG4J_CONFIG in solr.cmd
Date Mon, 06 Jun 2016 20:55:56 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x 6fd494ebe -> 87d46225c


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/87d46225
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/87d46225
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/87d46225

Branch: refs/heads/branch_6x
Commit: 87d46225cdc80f515ecd191fe618d2942eab8289
Parents: 6fd494e
Author: Mikhail Khludnev <mkhl@apache.org>
Authored: Fri Jun 3 01:05:28 2016 +0300
Committer: Mikhail Khludnev <mkhl@apache.org>
Committed: Mon Jun 6 23:55:01 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/87d46225/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 4737bfd..6f778ea 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -222,6 +222,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/87d46225/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"


Mime
View raw message