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 2018/01/29 15:51:20 UTC

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

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

Branch: refs/heads/master
Commit: b395d67365ca0c61bba8a71da0168fa441c21158
Parents: 9b2345e d58aa1e
Author: Gary Gregory <ga...@gmail.com>
Authored: Mon Jan 29 08:50:40 2018 -0700
Committer: Gary Gregory <ga...@gmail.com>
Committed: Mon Jan 29 08:50:40 2018 -0700

----------------------------------------------------------------------
 .../log4j/cassandra/CassandraAppender.java      |   2 +-
 .../cassandra/ClockTimestampGenerator.java      |   4 +-
 log4j-core-java9/pom.xml                        |   2 +-
 .../appender/rolling/action/IfLastModified.java |   4 +-
 .../logging/log4j/core/async/AsyncLogger.java   |   6 +-
 .../log4j/core/async/RingBufferLogEvent.java    |   2 +
 .../async/RingBufferLogEventTranslator.java     |   4 +-
 .../core/config/AbstractConfiguration.java      |   2 +-
 .../log4j/core/config/Configuration.java        |   2 +-
 .../logging/log4j/core/filter/TimeFilter.java   |   4 +-
 .../logging/log4j/core/impl/Log4jLogEvent.java  |   6 +-
 .../log4j/core/impl/MutableLogEvent.java        |   2 +
 .../core/impl/ReusableLogEventFactory.java      |   4 +-
 .../log4j/core/pattern/PatternParser.java       |   2 +-
 .../apache/logging/log4j/core/time/Clock.java   |  33 ++++++
 .../logging/log4j/core/time/ClockFactory.java   | 116 +++++++++++++++++++
 .../apache/logging/log4j/core/time/Instant.java |   1 -
 .../logging/log4j/core/time/MutableInstant.java |   1 -
 .../logging/log4j/core/time/NanoClock.java      |  36 ++++++
 .../logging/log4j/core/time/PreciseClock.java   |   2 -
 .../log4j/core/time/SystemNanoClock.java        |  37 ++++++
 .../log4j/core/time/internal/CachedClock.java   |   2 +-
 .../log4j/core/time/internal/ClockFactory.java  | 110 ------------------
 .../core/time/internal/CoarseCachedClock.java   |   2 +-
 .../core/time/internal/DummyNanoClock.java      |   2 +-
 .../log4j/core/time/internal/SystemClock.java   |   2 +-
 .../core/time/internal/SystemMillisClock.java   |   2 +-
 .../core/time/internal/SystemNanoClock.java     |  35 ------
 .../apache/logging/log4j/core/util/Clock.java   |  12 +-
 .../logging/log4j/core/util/ClockFactory.java   |  39 +++++++
 .../logging/log4j/core/util/NanoClock.java      |  12 +-
 .../log4j/core/util/SystemNanoClock.java        |  37 ++++++
 .../log4j/core/TimestampMessageTest.java        |   6 +-
 .../appender/JsonCompleteFileAppenderTest.java  |   2 +-
 .../core/async/AsyncLoggerTestNanoTime.java     |   2 +-
 .../async/AsyncLoggerTimestampMessageTest.java  |   6 +-
 .../log4j/core/filter/TimeFilterTest.java       |   6 +-
 .../core/impl/Log4jLogEventNanoTimeTest.java    |   2 +-
 .../log4j/core/impl/Log4jLogEventTest.java      |   6 +-
 .../log4j/core/pattern/PatternParserTest.java   |   2 +-
 .../log4j/core/time/ClockFactoryTest.java       | 106 +++++++++++++++++
 .../log4j/core/time/SystemNanoClockTest.java    |  39 +++++++
 .../core/time/internal/ClockFactoryTest.java    | 108 -----------------
 .../core/time/internal/SystemNanoClockTest.java |  41 -------
 .../logging/log4j/perf/jmh/ClocksBenchmark.java |   2 +-
 src/changes/changes.xml                         |   3 +
 src/site/xdoc/manual/appenders.xml              |   2 +-
 src/site/xdoc/manual/async.xml                  |   2 +-
 src/site/xdoc/manual/configuration.xml.vm       |   2 +-
 49 files changed, 503 insertions(+), 361 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b395d673/src/changes/changes.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b395d673/src/site/xdoc/manual/appenders.xml
----------------------------------------------------------------------