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/18 01:48:13 UTC
[1/3] lucene-solr:branch_5_5: SOLR-8445: fix line separator in
log4j.properties files
Repository: lucene-solr
Updated Branches:
refs/heads/branch_5_5 a4469911f -> c6b9ac065
refs/heads/branch_5x b83f82ddf -> 7f644688a
refs/heads/branch_6_0 2d1a88b2b -> 215f3d954
SOLR-8445: fix line separator in log4j.properties files
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c6b9ac06
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c6b9ac06
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c6b9ac06
Branch: refs/heads/branch_5_5
Commit: c6b9ac065571718e7e92174fa7e2a927583012fa
Parents: a446991
Author: Mikhail Khludnev <mk...@apache.org>
Authored: Tue Jun 7 00:21:49 2016 +0300
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 17 21:45:57 2016 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
solr/contrib/clustering/src/test-files/log4j.properties | 2 +-
solr/contrib/dataimporthandler/src/test-files/log4j.properties | 2 +-
solr/example/resources/log4j.properties | 2 +-
solr/server/resources/log4j.properties | 2 +-
solr/server/scripts/cloud-scripts/log4j.properties | 2 +-
6 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c6b9ac06/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index fe5eab5..0746a3e 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -112,6 +112,8 @@ Other Changes
* SOLR-9105: Fix a bunch of typos across 103 files (Bartosz Krasi\u0144ski via janhoy)
+* SOLR-8445: fix line separator in log4j.properties files (Ahmet Arslan via Mikhail Khludnev)
+
======================= 5.5.1 =======================
Bug Fixes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c6b9ac06/solr/contrib/clustering/src/test-files/log4j.properties
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/src/test-files/log4j.properties b/solr/contrib/clustering/src/test-files/log4j.properties
index 9b74a5f..b5216db 100644
--- a/solr/contrib/clustering/src/test-files/log4j.properties
+++ b/solr/contrib/clustering/src/test-files/log4j.properties
@@ -4,7 +4,7 @@ log4j.rootLogger=INFO, CONSOLE
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.Target=System.err
log4j.appender.CONSOLE.layout=org.apache.solr.util.SolrLogLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m\n
+log4j.appender.CONSOLE.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m%n
log4j.logger.org.apache.zookeeper=WARN
log4j.logger.org.apache.hadoop=WARN
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c6b9ac06/solr/contrib/dataimporthandler/src/test-files/log4j.properties
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test-files/log4j.properties b/solr/contrib/dataimporthandler/src/test-files/log4j.properties
index fbc817f..d3ea4de 100644
--- a/solr/contrib/dataimporthandler/src/test-files/log4j.properties
+++ b/solr/contrib/dataimporthandler/src/test-files/log4j.properties
@@ -4,6 +4,6 @@ log4j.rootLogger=INFO, CONSOLE
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.Target=System.err
log4j.appender.CONSOLE.layout=org.apache.solr.util.SolrLogLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m\n
+log4j.appender.CONSOLE.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m%n
log4j.logger.org.apache.zookeeper=WARN
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c6b9ac06/solr/example/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/solr/example/resources/log4j.properties b/solr/example/resources/log4j.properties
index 92b21e5..02f91c5 100644
--- a/solr/example/resources/log4j.properties
+++ b/solr/example/resources/log4j.properties
@@ -15,7 +15,7 @@ log4j.appender.file.MaxBackupIndex=9
#- File to log to and log format
log4j.appender.file.File=${solr.log}/solr.log
log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; [%X{collection} %X{shard} %X{replica} %X{core}] %C; %m\n
+log4j.appender.file.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; [%X{collection} %X{shard} %X{replica} %X{core}] %C; %m%n
log4j.logger.org.apache.zookeeper=WARN
log4j.logger.org.apache.hadoop=WARN
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c6b9ac06/solr/server/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/solr/server/resources/log4j.properties b/solr/server/resources/log4j.properties
index 2465eae..d5ebcd1 100644
--- a/solr/server/resources/log4j.properties
+++ b/solr/server/resources/log4j.properties
@@ -15,7 +15,7 @@ log4j.appender.file.MaxBackupIndex=9
#- File to log to and log format
log4j.appender.file.File=${solr.log}/solr.log
log4j.appender.file.layout=org.apache.log4j.EnhancedPatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%X{collection} %X{shard} %X{replica} %X{core}] %c{1.} %m\n
+log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%X{collection} %X{shard} %X{replica} %X{core}] %c{1.} %m%n
log4j.logger.org.apache.zookeeper=WARN
log4j.logger.org.apache.hadoop=WARN
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c6b9ac06/solr/server/scripts/cloud-scripts/log4j.properties
----------------------------------------------------------------------
diff --git a/solr/server/scripts/cloud-scripts/log4j.properties b/solr/server/scripts/cloud-scripts/log4j.properties
index c54b790..5f2ae18 100644
--- a/solr/server/scripts/cloud-scripts/log4j.properties
+++ b/solr/server/scripts/cloud-scripts/log4j.properties
@@ -5,7 +5,7 @@ log4j.rootLogger=INFO, stderr
log4j.appender.stderr = org.apache.log4j.ConsoleAppender
log4j.appender.stderr.Target = System.err
log4j.appender.stderr.layout = org.apache.log4j.PatternLayout
-log4j.appender.stderr.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m\n
+log4j.appender.stderr.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m%n
# quiet down the ZK logging for cli tools
log4j.logger.org.apache.zookeeper=WARN
[3/3] lucene-solr:branch_6_0: SOLR-8445: fix line separator in
log4j.properties files
Posted by sa...@apache.org.
SOLR-8445: fix line separator in log4j.properties files
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/215f3d95
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/215f3d95
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/215f3d95
Branch: refs/heads/branch_6_0
Commit: 215f3d954747ed823f63b306033c2f16a12bb3aa
Parents: 2d1a88b
Author: Mikhail Khludnev <mk...@apache.org>
Authored: Tue Jun 7 00:21:49 2016 +0300
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 17 21:48:01 2016 -0400
----------------------------------------------------------------------
solr/contrib/clustering/src/test-files/log4j.properties | 2 +-
solr/contrib/dataimporthandler/src/test-files/log4j.properties | 2 +-
solr/example/resources/log4j.properties | 2 +-
solr/server/resources/log4j.properties | 2 +-
solr/server/scripts/cloud-scripts/log4j.properties | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/215f3d95/solr/contrib/clustering/src/test-files/log4j.properties
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/src/test-files/log4j.properties b/solr/contrib/clustering/src/test-files/log4j.properties
index 9b74a5f..b5216db 100644
--- a/solr/contrib/clustering/src/test-files/log4j.properties
+++ b/solr/contrib/clustering/src/test-files/log4j.properties
@@ -4,7 +4,7 @@ log4j.rootLogger=INFO, CONSOLE
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.Target=System.err
log4j.appender.CONSOLE.layout=org.apache.solr.util.SolrLogLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m\n
+log4j.appender.CONSOLE.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m%n
log4j.logger.org.apache.zookeeper=WARN
log4j.logger.org.apache.hadoop=WARN
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/215f3d95/solr/contrib/dataimporthandler/src/test-files/log4j.properties
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test-files/log4j.properties b/solr/contrib/dataimporthandler/src/test-files/log4j.properties
index fbc817f..d3ea4de 100644
--- a/solr/contrib/dataimporthandler/src/test-files/log4j.properties
+++ b/solr/contrib/dataimporthandler/src/test-files/log4j.properties
@@ -4,6 +4,6 @@ log4j.rootLogger=INFO, CONSOLE
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.Target=System.err
log4j.appender.CONSOLE.layout=org.apache.solr.util.SolrLogLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m\n
+log4j.appender.CONSOLE.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m%n
log4j.logger.org.apache.zookeeper=WARN
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/215f3d95/solr/example/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/solr/example/resources/log4j.properties b/solr/example/resources/log4j.properties
index 92b21e5..02f91c5 100644
--- a/solr/example/resources/log4j.properties
+++ b/solr/example/resources/log4j.properties
@@ -15,7 +15,7 @@ log4j.appender.file.MaxBackupIndex=9
#- File to log to and log format
log4j.appender.file.File=${solr.log}/solr.log
log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; [%X{collection} %X{shard} %X{replica} %X{core}] %C; %m\n
+log4j.appender.file.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; [%X{collection} %X{shard} %X{replica} %X{core}] %C; %m%n
log4j.logger.org.apache.zookeeper=WARN
log4j.logger.org.apache.hadoop=WARN
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/215f3d95/solr/server/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/solr/server/resources/log4j.properties b/solr/server/resources/log4j.properties
index 2465eae..d5ebcd1 100644
--- a/solr/server/resources/log4j.properties
+++ b/solr/server/resources/log4j.properties
@@ -15,7 +15,7 @@ log4j.appender.file.MaxBackupIndex=9
#- File to log to and log format
log4j.appender.file.File=${solr.log}/solr.log
log4j.appender.file.layout=org.apache.log4j.EnhancedPatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%X{collection} %X{shard} %X{replica} %X{core}] %c{1.} %m\n
+log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%X{collection} %X{shard} %X{replica} %X{core}] %c{1.} %m%n
log4j.logger.org.apache.zookeeper=WARN
log4j.logger.org.apache.hadoop=WARN
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/215f3d95/solr/server/scripts/cloud-scripts/log4j.properties
----------------------------------------------------------------------
diff --git a/solr/server/scripts/cloud-scripts/log4j.properties b/solr/server/scripts/cloud-scripts/log4j.properties
index c54b790..5f2ae18 100644
--- a/solr/server/scripts/cloud-scripts/log4j.properties
+++ b/solr/server/scripts/cloud-scripts/log4j.properties
@@ -5,7 +5,7 @@ log4j.rootLogger=INFO, stderr
log4j.appender.stderr = org.apache.log4j.ConsoleAppender
log4j.appender.stderr.Target = System.err
log4j.appender.stderr.layout = org.apache.log4j.PatternLayout
-log4j.appender.stderr.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m\n
+log4j.appender.stderr.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m%n
# quiet down the ZK logging for cli tools
log4j.logger.org.apache.zookeeper=WARN
[2/3] lucene-solr:branch_5x: SOLR-8445: fix line separator in
log4j.properties files
Posted by sa...@apache.org.
SOLR-8445: fix line separator in log4j.properties files
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7f644688
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7f644688
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7f644688
Branch: refs/heads/branch_5x
Commit: 7f644688ab6ec7d441b4cbe1daa6f810bf229312
Parents: b83f82d
Author: Mikhail Khludnev <mk...@apache.org>
Authored: Tue Jun 7 00:21:49 2016 +0300
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 17 21:47:23 2016 -0400
----------------------------------------------------------------------
solr/contrib/clustering/src/test-files/log4j.properties | 2 +-
solr/contrib/dataimporthandler/src/test-files/log4j.properties | 2 +-
solr/example/resources/log4j.properties | 2 +-
solr/server/resources/log4j.properties | 2 +-
solr/server/scripts/cloud-scripts/log4j.properties | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7f644688/solr/contrib/clustering/src/test-files/log4j.properties
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/src/test-files/log4j.properties b/solr/contrib/clustering/src/test-files/log4j.properties
index 9b74a5f..b5216db 100644
--- a/solr/contrib/clustering/src/test-files/log4j.properties
+++ b/solr/contrib/clustering/src/test-files/log4j.properties
@@ -4,7 +4,7 @@ log4j.rootLogger=INFO, CONSOLE
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.Target=System.err
log4j.appender.CONSOLE.layout=org.apache.solr.util.SolrLogLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m\n
+log4j.appender.CONSOLE.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m%n
log4j.logger.org.apache.zookeeper=WARN
log4j.logger.org.apache.hadoop=WARN
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7f644688/solr/contrib/dataimporthandler/src/test-files/log4j.properties
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test-files/log4j.properties b/solr/contrib/dataimporthandler/src/test-files/log4j.properties
index fbc817f..d3ea4de 100644
--- a/solr/contrib/dataimporthandler/src/test-files/log4j.properties
+++ b/solr/contrib/dataimporthandler/src/test-files/log4j.properties
@@ -4,6 +4,6 @@ log4j.rootLogger=INFO, CONSOLE
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.Target=System.err
log4j.appender.CONSOLE.layout=org.apache.solr.util.SolrLogLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m\n
+log4j.appender.CONSOLE.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m%n
log4j.logger.org.apache.zookeeper=WARN
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7f644688/solr/example/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/solr/example/resources/log4j.properties b/solr/example/resources/log4j.properties
index 92b21e5..02f91c5 100644
--- a/solr/example/resources/log4j.properties
+++ b/solr/example/resources/log4j.properties
@@ -15,7 +15,7 @@ log4j.appender.file.MaxBackupIndex=9
#- File to log to and log format
log4j.appender.file.File=${solr.log}/solr.log
log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; [%X{collection} %X{shard} %X{replica} %X{core}] %C; %m\n
+log4j.appender.file.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; [%X{collection} %X{shard} %X{replica} %X{core}] %C; %m%n
log4j.logger.org.apache.zookeeper=WARN
log4j.logger.org.apache.hadoop=WARN
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7f644688/solr/server/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/solr/server/resources/log4j.properties b/solr/server/resources/log4j.properties
index 2465eae..d5ebcd1 100644
--- a/solr/server/resources/log4j.properties
+++ b/solr/server/resources/log4j.properties
@@ -15,7 +15,7 @@ log4j.appender.file.MaxBackupIndex=9
#- File to log to and log format
log4j.appender.file.File=${solr.log}/solr.log
log4j.appender.file.layout=org.apache.log4j.EnhancedPatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%X{collection} %X{shard} %X{replica} %X{core}] %c{1.} %m\n
+log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%X{collection} %X{shard} %X{replica} %X{core}] %c{1.} %m%n
log4j.logger.org.apache.zookeeper=WARN
log4j.logger.org.apache.hadoop=WARN
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7f644688/solr/server/scripts/cloud-scripts/log4j.properties
----------------------------------------------------------------------
diff --git a/solr/server/scripts/cloud-scripts/log4j.properties b/solr/server/scripts/cloud-scripts/log4j.properties
index c54b790..5f2ae18 100644
--- a/solr/server/scripts/cloud-scripts/log4j.properties
+++ b/solr/server/scripts/cloud-scripts/log4j.properties
@@ -5,7 +5,7 @@ log4j.rootLogger=INFO, stderr
log4j.appender.stderr = org.apache.log4j.ConsoleAppender
log4j.appender.stderr.Target = System.err
log4j.appender.stderr.layout = org.apache.log4j.PatternLayout
-log4j.appender.stderr.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m\n
+log4j.appender.stderr.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m%n
# quiet down the ZK logging for cli tools
log4j.logger.org.apache.zookeeper=WARN