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 2016/04/16 09:37:02 UTC
[1/2] logging-log4j2 git commit: removed trailing whitespace
Repository: logging-log4j2
Updated Branches:
refs/heads/master d9a373f7f -> adcdfc0e2
removed trailing whitespace
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e6d1b976
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e6d1b976
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e6d1b976
Branch: refs/heads/master
Commit: e6d1b9768f09b504c9667e9160261459859f308b
Parents: d9a373f
Author: rpopma <rp...@apache.org>
Authored: Sat Apr 16 16:33:51 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sat Apr 16 16:33:51 2016 +0900
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/jackson/Initializers.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e6d1b976/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Initializers.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Initializers.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Initializers.java
index b27bce6..f6cc708 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Initializers.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Initializers.java
@@ -48,7 +48,7 @@ class Initializers {
context.setMixInAnnotations(LogEvent.class, LogEventMixIn.class);
// Log4j Core classes: we do not want to bring in Jackson at runtime if we do not have to.
context.setMixInAnnotations(ExtendedStackTraceElement.class, ExtendedStackTraceElementMixIn.class);
- context.setMixInAnnotations(ThrowableProxy.class, ThrowableProxyMixIn.class);
+ context.setMixInAnnotations(ThrowableProxy.class, ThrowableProxyMixIn.class);
}
}
[2/2] logging-log4j2 git commit: removed trailing whitespace
Posted by rp...@apache.org.
removed trailing whitespace
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/adcdfc0e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/adcdfc0e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/adcdfc0e
Branch: refs/heads/master
Commit: adcdfc0e219e92177a33c199608584fc6cdfb6ca
Parents: e6d1b97
Author: rpopma <rp...@apache.org>
Authored: Sat Apr 16 16:37:03 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sat Apr 16 16:37:03 2016 +0900
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/layout/JacksonFactory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/adcdfc0e/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JacksonFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JacksonFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JacksonFactory.java
index 537b634..e59fa53 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JacksonFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JacksonFactory.java
@@ -106,7 +106,7 @@ abstract class JacksonFactory {
abstract protected String getPropertNameForContextMap();
abstract protected String getPropertNameForSource();
-
+
abstract protected String getPropertNameForNanoTime();
abstract protected PrettyPrinter newCompactPrinter();