You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2016/06/17 23:26:33 UTC
[1/3] lucene-solr:branch_5_5: SOLR-8676: keep LOG4J_CONFIG in solr.cmd
Repository: lucene-solr
Updated Branches:
refs/heads/branch_5_5 0cd5356a7 -> 3d8a6b0cb
refs/heads/branch_5x 66dd9bc63 -> c20b41fe6
refs/heads/branch_6_0 7e2252cbc -> 60c140c24
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/3d8a6b0c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3d8a6b0c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3d8a6b0c
Branch: refs/heads/branch_5_5
Commit: 3d8a6b0cb8be7c5e7fc683d13034d74d46238c44
Parents: 0cd5356
Author: Mikhail Khludnev <mk...@apache.org>
Authored: Fri Jun 3 01:05:28 2016 +0300
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 17 19:25:25 2016 -0400
----------------------------------------------------------------------
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/3d8a6b0c/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 3e2dbb5..a6e1e03 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -83,6 +83,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)
+
Other Changes
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3d8a6b0c/solr/bin/solr.cmd
----------------------------------------------------------------------
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index 6fcc6f7..c15c0aa 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"
[3/3] lucene-solr:branch_6_0: SOLR-8676: keep LOG4J_CONFIG in solr.cmd
Posted by sa...@apache.org.
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/60c140c2
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/60c140c2
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/60c140c2
Branch: refs/heads/branch_6_0
Commit: 60c140c244c4f93bbd3af2fe1b6244101a8db971
Parents: 7e2252c
Author: Mikhail Khludnev <mk...@apache.org>
Authored: Fri Jun 3 01:05:28 2016 +0300
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 17 19:26:26 2016 -0400
----------------------------------------------------------------------
solr/bin/solr.cmd | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/60c140c2/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"
[2/3] lucene-solr:branch_5x: SOLR-8676: keep LOG4J_CONFIG in solr.cmd
Posted by sa...@apache.org.
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/c20b41fe
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c20b41fe
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c20b41fe
Branch: refs/heads/branch_5x
Commit: c20b41fe6b1d023a5bdf30e39afa1b470597bcc5
Parents: 66dd9bc
Author: Mikhail Khludnev <mk...@apache.org>
Authored: Fri Jun 3 01:05:28 2016 +0300
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 17 19:25:55 2016 -0400
----------------------------------------------------------------------
solr/bin/solr.cmd | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c20b41fe/solr/bin/solr.cmd
----------------------------------------------------------------------
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index 397e36d..6e9d3fc 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"