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/07/30 13:03:28 UTC
[12/15] logging-log4j2 git commit: Merge branches
'LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure' and
'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2 into
LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-data
Merge branches 'LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure' and 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2 into LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/707e03bd
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/707e03bd
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/707e03bd
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: 707e03bd39a25f8b70a37fcfd4de52e1953e207b
Parents: 3c1d714 8529086
Author: rpopma <rp...@apache.org>
Authored: Sat Jul 30 20:11:45 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sat Jul 30 20:11:45 2016 +0900
----------------------------------------------------------------------
log4j-1.2-api/pom.xml | 1 +
.../apache/logging/log4j/TraceLoggingTest.java | 1 -
.../logging/log4j/junit/BundleTestInfo.java | 137 +++++++++---------
.../apache/logging/log4j/junit/OsgiRule.java | 141 ++++++++++---------
log4j-core/.gitignore | 11 +-
log4j-core/pom.xml | 10 ++
.../rolling/action/FileRenameAction.java | 1 -
.../log4j/core/pattern/JAnsiTextRenderer.java | 2 -
.../log4j/core/pattern/NameAbbreviator.java | 2 +
.../apache/logging/log4j/core/util/Loader.java | 1 -
.../core/layout/CsvParameterLayoutTest.java | 1 -
.../osgi/equinox/EquinoxLoadCoreBundleTest.java | 6 +-
.../osgi/felix/FelixLoadCoreBundleTest.java | 4 +
log4j-flume-ng/pom.xml | 1 +
log4j-jmx-gui/pom.xml | 1 +
log4j-jul/pom.xml | 1 +
log4j-nosql/pom.xml | 1 +
log4j-web/pom.xml | 1 +
pom.xml | 6 +
src/changes/changes.xml | 6 +
20 files changed, 189 insertions(+), 146 deletions(-)
----------------------------------------------------------------------