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

Branch: refs/heads/master
Commit: 817d89838afea77e35048cbc8da7a5df38a0076a
Parents: ed3c803 800db9c
Author: Gary Gregory <ggreg...@apache.org>
Authored: Thu Sep 22 10:04:30 2016 -0700
Committer: Gary Gregory <ggreg...@apache.org>
Committed: Thu Sep 22 10:04:30 2016 -0700

----------------------------------------------------------------------
 .../CopyOnWriteSortedArrayThreadContextMap.java |  66 +-
 .../log4j/spi/DefaultThreadContextMap.java      |   4 +-
 .../GarbageFreeSortedArrayThreadContextMap.java |  66 +-
 .../logging/log4j/spi/ThreadContextMap2.java    |   8 +-
 .../apache/logging/log4j/util/BiConsumer.java   |   2 +-
 .../apache/logging/log4j/util/ContextData.java  | 106 ---
 .../logging/log4j/util/MutableContextData.java  |  98 ---
 .../logging/log4j/util/ReadOnlyStringMap.java   | 106 +++
 .../log4j/util/SortedArrayStringMap.java        | 477 ++++++++++++
 .../log4j/util/SortedStringArrayMap.java        | 477 ------------
 .../apache/logging/log4j/util/StringMap.java    |  98 +++
 .../apache/logging/log4j/util/TriConsumer.java  |   2 +-
 .../log4j/util/SortedArrayStringMapTest.java    | 772 +++++++++++++++++++
 .../log4j/util/SortedStringArrayMapTest.java    | 772 -------------------
 .../logging/log4j/core/AbstractLogEvent.java    |   4 +-
 .../logging/log4j/core/ContextDataInjector.java |  30 +-
 .../org/apache/logging/log4j/core/LogEvent.java |   8 +-
 .../db/jpa/AbstractLogEventWrapperEntity.java   |   8 +-
 .../ContextDataAttributeConverter.java          |  10 +-
 .../ContextDataJsonAttributeConverter.java      |  14 +-
 .../logging/log4j/core/async/AsyncLogger.java   |   8 +-
 .../log4j/core/async/RingBufferLogEvent.java    |  12 +-
 .../async/RingBufferLogEventTranslator.java     |   4 +-
 .../core/filter/DynamicThresholdFilter.java     |   6 +-
 .../logging/log4j/core/filter/MapFilter.java    |   4 +-
 .../core/filter/ThreadContextMapFilter.java     |   6 +-
 .../log4j/core/impl/ContextDataFactory.java     |  24 +-
 .../core/impl/ContextDataInjectorFactory.java   |   6 +-
 .../logging/log4j/core/impl/Log4jLogEvent.java  |  38 +-
 .../log4j/core/impl/MutableLogEvent.java        |  12 +-
 .../core/impl/ReusableLogEventFactory.java      |   4 +-
 .../core/impl/ThreadContextDataInjector.java    |  80 +-
 .../ContextDataAsEntryListDeserializer.java     |   8 +-
 .../ContextDataAsEntryListSerializer.java       |   6 +-
 .../core/jackson/ContextDataDeserializer.java   |   8 +-
 .../core/jackson/ContextDataSerializer.java     |   6 +-
 .../log4j/core/jackson/LogEventJsonMixIn.java   |   4 +-
 .../jackson/LogEventWithContextListMixIn.java   |   4 +-
 .../log4j/core/lookup/ContextMapLookup.java     |   4 +-
 .../log4j/core/pattern/MdcPatternConverter.java |   8 +-
 .../core/appender/db/jpa/TestBaseEntity.java    |   4 +-
 .../ContextDataAttributeConverterTest.java      |   8 +-
 .../ContextDataJsonAttributeConverterTest.java  |  14 +-
 .../core/async/RingBufferLogEventTest.java      |  16 +-
 .../log4j/core/impl/Log4jLogEventTest.java      |   8 +-
 .../log4j/core/impl/MutableLogEventTest.java    |  10 +-
 .../log4j/flume/appender/FlumeEvent.java        |   4 +-
 .../perf/jmh/SortedArrayVsHashMapBenchmark.java |  18 +-
 .../log4j/perf/jmh/ThreadContextBenchmark.java  |  12 +-
 .../log4j/perf/nogc/OpenHashMapContextData.java |  24 +-
 .../CopyOnWriteOpenHashMapThreadContextMap.java |   8 +-
 .../GarbageFreeOpenHashMapThreadContextMap.java |   8 +-
 .../org/apache/logging/slf4j/MDCContextMap.java |  10 +-
 53 files changed, 1762 insertions(+), 1762 deletions(-)
----------------------------------------------------------------------


Reply via email to