You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2015/12/02 16:53:33 UTC

[1/2] logging-log4j2 git commit: Replace String protocol method with type-safe enum Protocol.

Repository: logging-log4j2
Updated Branches:
  refs/heads/master 5a14032f2 -> fe4ace50c


Replace String protocol method with type-safe enum Protocol.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/9ef298b5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9ef298b5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9ef298b5

Branch: refs/heads/master
Commit: 9ef298b5c82471944ab3c5508578c5752e0e7f60
Parents: 1c786f6
Author: ggregory <gg...@apache.org>
Authored: Wed Dec 2 07:52:39 2015 -0800
Committer: ggregory <gg...@apache.org>
Committed: Wed Dec 2 07:52:39 2015 -0800

----------------------------------------------------------------------
 .../org/apache/logging/log4j/core/appender/SocketAppenderTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9ef298b5/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
index 150ae70..9a7f9d5 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
@@ -144,7 +144,7 @@ public class SocketAppenderTest {
     @Test
     public void testDefaultProtocol() throws Exception {
 
-        final SocketAppender appender = SocketAppender.createAppender("localhost", PORT, null, null, 0, "-1",
+        final SocketAppender appender = SocketAppender.createAppender("localhost", PORT, (Protocol) null, null, 0, "-1",
                 "false", "Test", null, null, null, null, null, null);
         assertNotNull(appender);
     }


[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git

Posted by gg...@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/fe4ace50
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/fe4ace50
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/fe4ace50

Branch: refs/heads/master
Commit: fe4ace50c91384ae6fc7c3314a5669aabb5db6ae
Parents: 9ef298b 5a14032
Author: ggregory <gg...@apache.org>
Authored: Wed Dec 2 07:52:58 2015 -0800
Committer: ggregory <gg...@apache.org>
Committed: Wed Dec 2 07:52:58 2015 -0800

----------------------------------------------------------------------
 .../log4j/core/appender/HangingAppender.java    | 29 ++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)
----------------------------------------------------------------------