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/08/01 15:12:43 UTC
[4/5] logging-log4j2 git commit: Merge branch 'master' into
LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Merge branch 'master' 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/60626cc2
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/60626cc2
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/60626cc2
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: 60626cc21ac2613d9048ac675d98dbd41fbb1be0
Parents: e481e45 641014d
Author: rpopma <rp...@apache.org>
Authored: Tue Aug 2 00:06:10 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Tue Aug 2 00:06:10 2016 +0900
----------------------------------------------------------------------
.../org/apache/logging/log4j/message/ObjectMessage.java | 1 +
.../logging/log4j/message/ReusableObjectMessage.java | 1 +
.../logging/log4j/core/pattern/HighlightConverter.java | 3 ++-
.../log4j/core/util/datetime/FixedDateFormat.java | 5 +++++
.../log4j/core/pattern/DatePatternConverterTest.java | 11 +++++++++++
5 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/60626cc2/log4j-api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java
----------------------------------------------------------------------