This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Log4cpp Git repository.".
The branch, master has been updated
via 1538197ad8a0c65e63c42d4a63cdadf00982c747 (commit)
via 4aaf87069b87147c293c92a99c9e5c89edf7652b (commit)
via 1871fa7ad9f4fd32ce2136ad46c09ef155bdba17 (commit)
from e036c02e9c95ec06425d0903a86518a87b8f7408 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceforge.net/p/log4cpp/codegit/ci/
commit 1538197ad8a0c65e63c42d4a63cdadf00982c747
Merge: e036c02 4aaf870
Author: Alexander Perepelkin <san...@us...>
Date: Fri Apr 29 11:14:20 2016 +0400
Merge branch 'bug-139-mem-leaks-alltogether' of ssh://git.code.sf.net/p/log4cpp/codegit
diff --cc tests/log4cpp.nt.property
index 2bfbb22,0aa3f8d..e12b6a2
--- a/tests/log4cpp.nt.property
+++ b/tests/log4cpp.nt.property
@@@ -21,22 -21,10 +21,22 @@@ log4cpp.appender.A2.layout.ConversionPa
log4cpp.appender.A3=RollingFileAppender
log4cpp.appender.A3.fileName=A3.log
log4cpp.appender.A3.maxFileSize=80
- log4cpp.appender.A3.maxBackupIndex=1
+ log4cpp.appender.A3.maxBackupIndex=2
log4cpp.appender.A3.layout=PatternLayout
- log4cpp.appender.A3.layout.ConversionPattern=The message %m at time %d{%H:%M}%n
+ log4cpp.appender.A3.layout.ConversionPattern=The message %m at time %d{%H:%M:%S,%l}%n
+log4cpp.appender.stderrAppender=ConsoleAppender
+log4cpp.appender.stderrAppender.layout=PatternLayout
+log4cpp.appender.stderrAppender.layout.ConversionPattern=stderr: %m%n
+log4cpp.appender.stderrAppender.target=stdErr
+log4cpp.appender.stderrAppender.threshold=ERROR
+
+log4cpp.appender.stdoutAppender=ConsoleAppender
+log4cpp.appender.stdoutAppender.layout=PatternLayout
+log4cpp.appender.stdoutAppender.layout.ConversionPattern=stdout: %m%n
+log4cpp.appender.stdoutAppender.target=StdOut
+log4cpp.appender.stdoutAppender.threshold=ERROR
+
log4cpp.category.subNT=INFO, subNT
log4cpp.appender.subNT=NTEventLogAppender
log4cpp.appender.subNT.source=log4cpp-test
-----------------------------------------------------------------------
Summary of changes:
include/log4cpp/Appender.hh | 27 ++++-
include/log4cpp/Category.hh | 6 +
include/log4cpp/Portability.hh | 16 +++
.../log4cppRunnable.vcxproj} | 39 +++++--
msvc10/msvc10.sln | 128 +++++++++++---------
msvc10/testPropConfig/testPropConfig.vcxproj | 6 +-
src/Appender.cpp | 76 +++++++++---
src/Category.cpp | 6 +
src/HierarchyMaintainer.cpp | 2 +
src/PropertyConfigurator.cpp | 2 +-
tests/log4cpp.nt.property | 4 +-
tests/testPropConfig.cpp | 46 +++++--
12 files changed, 250 insertions(+), 108 deletions(-)
copy msvc10/{log4cpp/log4cpp.vcxproj => log4cppRunnable/log4cppRunnable.vcxproj} (93%)
hooks/post-receive
--
Log4cpp Git repository.
|
