You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2015/08/09 18:32:54 UTC
[1/2] logging-log4j2 git commit: fixed test that broke because an
import line became unnecessary and was removed
Repository: logging-log4j2
Updated Branches:
refs/heads/master b2acf121b -> 60a9a28b5
fixed test that broke because an import line became unnecessary and was
removed
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e4dd47a3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e4dd47a3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e4dd47a3
Branch: refs/heads/master
Commit: e4dd47a3b5d7be9f4c3fa4796d493ea1c6d6dbb6
Parents: 6a12b38
Author: rpopma <rp...@apache.org>
Authored: Mon Aug 10 01:32:19 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Mon Aug 10 01:32:19 2015 +0900
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/pattern/PatternParserTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e4dd47a3/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java
index ec39c0c..d29eac8 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java
@@ -111,7 +111,7 @@ public class PatternParserTest {
formatter.format(event, buf);
}
final String str = buf.toString();
- final String expected = "INFO [PatternParserTest :98 ] - Hello, world" + Constants.LINE_SEPARATOR;
+ final String expected = "INFO [PatternParserTest :97 ] - Hello, world" + Constants.LINE_SEPARATOR;
assertTrue("Expected to end with: " + expected + ". Actual: " + str, str.endsWith(expected));
}
[2/2] logging-log4j2 git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Posted by rp...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/60a9a28b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/60a9a28b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/60a9a28b
Branch: refs/heads/master
Commit: 60a9a28b50c1228fa7587a8b816171d05f7fb3d7
Parents: e4dd47a3 b2acf12
Author: rpopma <rp...@apache.org>
Authored: Mon Aug 10 01:32:35 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Mon Aug 10 01:32:35 2015 +0900
----------------------------------------------------------------------
.../org/apache/logging/log4j/LogManager.java | 16 +-
.../java/org/apache/logging/log4j/Logger2.java | 1476 +++++++++---------
.../logging/log4j/util/MessageSupplier.java | 80 +-
.../org/apache/logging/log4j/util/Supplier.java | 80 +-
4 files changed, 826 insertions(+), 826 deletions(-)
----------------------------------------------------------------------