Branch: refs/heads/master Home: https://github.com/qos-ch/slf4j Commit: 22ef2008ec109617d15353e6c8eb47ffcb61cdaa https://github.com/qos-ch/slf4j/commit/22ef2008ec109617d15353e6c8eb47ffcb61c... Author: Luke Cwik <lcwik@google.com> Date: 2015-01-27 (Tue, 27 Jan 2015) Changed paths: M slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java A slf4j-api/src/test/java/org/slf4j/helpers/BasicMDCAdapterTest.java Log Message: ----------- Fix bug: http://bugzilla.slf4j.org/show_bug.cgi?id=325 BasicMDCAdapter leaks MDC information to non-child threads BasicMDCAdapter uses a ConcurrentHashMap which is passed by reference from the parent to the child. All child threads then share the same map reference and any modifications by one child is visible to the parent thread and also all other child threads. Swapped to creating a copy of the parents map instead of storing reference. Also, since this is expected to be only accessed from within the same thread, swapped to use a hash map instead of a concurrent hash map. Signed-off-by: Luke Cwik <lcwik@google.com> Commit: 95a6f46ebae7e39b94bd0323c5359df427bcb045 https://github.com/qos-ch/slf4j/commit/95a6f46ebae7e39b94bd0323c5359df427bcb... Author: Luke Cwik <lcwik@google.com> Date: 2015-04-07 (Tue, 07 Apr 2015) Changed paths: M slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java Log Message: ----------- Removed Google Copyright. Commit: 734c5e441080f98aa86af4a50f25a683370a25c8 https://github.com/qos-ch/slf4j/commit/734c5e441080f98aa86af4a50f25a683370a2... Author: Luke Cwik <lcwik@google.com> Date: 2015-04-09 (Thu, 09 Apr 2015) Changed paths: M slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java Log Message: ----------- Rename Map -> map based upon mattbishop comment for https://github.com/qos-ch/slf4j/pull/99 Commit: 26e7a4f0bfa1c5b9f68c763b78f5abd1c88d4b4a https://github.com/qos-ch/slf4j/commit/26e7a4f0bfa1c5b9f68c763b78f5abd1c88d4... Author: Luke Cwik <lcwik@google.com> Date: 2015-04-30 (Thu, 30 Apr 2015) Changed paths: M .travis.yml M codeStyle.xml M integration/pom.xml M integration/src/IBUNDLE-META-INF/MANIFEST.MF M integration/src/test/java/integrator/Activator.java M integration/src/test/java/org/slf4j/CompatibilityAssertionTest.java M integration/src/test/java/org/slf4j/IncompatibleMultiBindingAssertionTest.java M integration/src/test/java/org/slf4j/MissingSingletonMethodAssertionTest.java M integration/src/test/java/org/slf4j/MultiBindingAssertionTest.java M integration/src/test/java/org/slf4j/StringPrintStream.java M integration/src/test/java/org/slf4j/VersionMismatchAssertionTest.java M integration/src/test/java/org/slf4j/test_osgi/BundleTest.java M integration/src/test/java/org/slf4j/test_osgi/CheckingBundleListener.java M integration/src/test/java/org/slf4j/test_osgi/FelixHost.java M integration/src/test/java/org/slf4j/test_osgi/FrameworkErrorListener.java M jcl-over-slf4j/pom.xml M jcl-over-slf4j/src/main/java/org/apache/commons/logging/Log.java M jcl-over-slf4j/src/main/java/org/apache/commons/logging/LogConfigurationException.java M jcl-over-slf4j/src/main/java/org/apache/commons/logging/LogFactory.java M jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/NoOpLog.java M jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLocationAwareLog.java M jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLog.java M jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLogFactory.java M jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SimpleLog.java M jcl-over-slf4j/src/main/resources/META-INF/MANIFEST.MF M jcl-over-slf4j/src/test/java/org/apache/commons/logging/InvokeJCLTest.java M jcl-over-slf4j/src/test/java/org/apache/commons/logging/impl/SerializationTest.java M jul-to-slf4j/pom.xml M jul-to-slf4j/src/main/java/org/slf4j/bridge/SLF4JBridgeHandler.java M jul-to-slf4j/src/main/resources/META-INF/MANIFEST.MF M jul-to-slf4j/src/test/java/org/slf4j/bridge/ListAppender.java M jul-to-slf4j/src/test/java/org/slf4j/bridge/SLF4JBridgeHandlerPerfTest.java M jul-to-slf4j/src/test/java/org/slf4j/bridge/SLF4JBridgeHandlerTest.java M log4j-over-slf4j/pom.xml M log4j-over-slf4j/src/main/java/org/apache/log4j/Appender.java M log4j-over-slf4j/src/main/java/org/apache/log4j/AppenderSkeleton.java M log4j-over-slf4j/src/main/java/org/apache/log4j/BasicConfigurator.java M log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java M log4j-over-slf4j/src/main/java/org/apache/log4j/FileAppender.java M log4j-over-slf4j/src/main/java/org/apache/log4j/Level.java M log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java M log4j-over-slf4j/src/main/java/org/apache/log4j/LogManager.java M log4j-over-slf4j/src/main/java/org/apache/log4j/Logger.java M log4j-over-slf4j/src/main/java/org/apache/log4j/MDC.java M log4j-over-slf4j/src/main/java/org/apache/log4j/NDC.java M log4j-over-slf4j/src/main/java/org/apache/log4j/PatternLayout.java M log4j-over-slf4j/src/main/java/org/apache/log4j/Priority.java M log4j-over-slf4j/src/main/java/org/apache/log4j/PropertyConfigurator.java M log4j-over-slf4j/src/main/java/org/apache/log4j/RollingFileAppender.java M log4j-over-slf4j/src/main/java/org/apache/log4j/helpers/LogLog.java M log4j-over-slf4j/src/main/java/org/apache/log4j/helpers/NullEnumeration.java M log4j-over-slf4j/src/main/java/org/apache/log4j/spi/Configurator.java M log4j-over-slf4j/src/main/java/org/apache/log4j/spi/HierarchyEventListener.java M log4j-over-slf4j/src/main/java/org/apache/log4j/spi/LoggerFactory.java M log4j-over-slf4j/src/main/java/org/apache/log4j/spi/LoggerRepository.java M log4j-over-slf4j/src/main/java/org/apache/log4j/spi/OptionHandler.java M log4j-over-slf4j/src/main/java/org/apache/log4j/xml/DOMConfigurator.java M log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF M log4j-over-slf4j/src/test/java/org/apache/log4j/NDCTest.java M log4j-over-slf4j/src/test/java/org/apache/log4j/Trivial.java M log4j-over-slf4j/src/test/java/org/dummy/Bug131.java M log4j-over-slf4j/src/test/java/org/dummy/Bug139.java M log4j-over-slf4j/src/test/java/org/dummy/ListHandler.java M osgi-over-slf4j/pom.xml M osgi-over-slf4j/src/main/java/org/slf4j/osgi/logservice/impl/Activator.java M osgi-over-slf4j/src/main/java/org/slf4j/osgi/logservice/impl/LogServiceFactory.java M osgi-over-slf4j/src/main/java/org/slf4j/osgi/logservice/impl/LogServiceImpl.java M pom.xml M slf4j-android/pom.xml M slf4j-android/src/main/java/org/slf4j/impl/AndroidLoggerAdapter.java M slf4j-api/pom.xml M slf4j-api/src/main/java/org/slf4j/ILoggerFactory.java M slf4j-api/src/main/java/org/slf4j/IMarkerFactory.java M slf4j-api/src/main/java/org/slf4j/Logger.java M slf4j-api/src/main/java/org/slf4j/LoggerFactory.java M slf4j-api/src/main/java/org/slf4j/MDC.java M slf4j-api/src/main/java/org/slf4j/Marker.java M slf4j-api/src/main/java/org/slf4j/MarkerFactory.java M slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java M slf4j-api/src/main/java/org/slf4j/helpers/BasicMarker.java M slf4j-api/src/main/java/org/slf4j/helpers/BasicMarkerFactory.java M slf4j-api/src/main/java/org/slf4j/helpers/FormattingTuple.java M slf4j-api/src/main/java/org/slf4j/helpers/MarkerIgnoringBase.java M slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java M slf4j-api/src/main/java/org/slf4j/helpers/NOPLogger.java M slf4j-api/src/main/java/org/slf4j/helpers/NOPLoggerFactory.java M slf4j-api/src/main/java/org/slf4j/helpers/NOPMDCAdapter.java M slf4j-api/src/main/java/org/slf4j/helpers/NamedLoggerBase.java M slf4j-api/src/main/java/org/slf4j/helpers/SubstituteLogger.java M slf4j-api/src/main/java/org/slf4j/helpers/SubstituteLoggerFactory.java M slf4j-api/src/main/java/org/slf4j/helpers/Util.java M slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java M slf4j-api/src/main/java/org/slf4j/impl/StaticMDCBinder.java M slf4j-api/src/main/java/org/slf4j/impl/StaticMarkerBinder.java M slf4j-api/src/main/java/org/slf4j/spi/LocationAwareLogger.java M slf4j-api/src/main/java/org/slf4j/spi/LoggerFactoryBinder.java M slf4j-api/src/main/java/org/slf4j/spi/MDCAdapter.java M slf4j-api/src/main/java/org/slf4j/spi/MarkerFactoryBinder.java M slf4j-api/src/main/resources/META-INF/MANIFEST.MF M slf4j-api/src/test/java/org/slf4j/BasicMarkerTest.java M slf4j-api/src/test/java/org/slf4j/Differentiator.java M slf4j-api/src/test/java/org/slf4j/NoBindingTest.java M slf4j-api/src/test/java/org/slf4j/helpers/BogoPerf.java M slf4j-api/src/test/java/org/slf4j/helpers/BubbleSort.java M slf4j-api/src/test/java/org/slf4j/helpers/BubbleSortTest.java M slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterPerfTest.java M slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterTest.java M slf4j-api/src/test/java/org/slf4j/helpers/MyRandom.java M slf4j-api/src/test/java/org/slf4j/helpers/SubstitutableLoggerTest.java M slf4j-api/src/test/java/org/slf4j/helpers/SubstituteLoggerFactoryTest.java M slf4j-ext/pom.xml M slf4j-ext/src/main/java/org/slf4j/NDC.java M slf4j-ext/src/main/java/org/slf4j/agent/AgentOptions.java M slf4j-ext/src/main/java/org/slf4j/agent/AgentPremain.java M slf4j-ext/src/main/java/org/slf4j/cal10n/LocLogger.java M slf4j-ext/src/main/java/org/slf4j/cal10n/LocLoggerFactory.java M slf4j-ext/src/main/java/org/slf4j/ext/EventData.java M slf4j-ext/src/main/java/org/slf4j/ext/EventException.java M slf4j-ext/src/main/java/org/slf4j/ext/EventLogger.java M slf4j-ext/src/main/java/org/slf4j/ext/LoggerWrapper.java M slf4j-ext/src/main/java/org/slf4j/ext/MDCStrLookup.java M slf4j-ext/src/main/java/org/slf4j/ext/XLogger.java M slf4j-ext/src/main/java/org/slf4j/ext/XLoggerFactory.java M slf4j-ext/src/main/java/org/slf4j/instrumentation/JavassistHelper.java M slf4j-ext/src/main/java/org/slf4j/instrumentation/LogTransformer.java M slf4j-ext/src/main/java/org/slf4j/instrumentation/ToStringHelper.java M slf4j-ext/src/main/java/org/slf4j/profiler/DurationUnit.java M slf4j-ext/src/main/java/org/slf4j/profiler/Profiler.java M slf4j-ext/src/main/java/org/slf4j/profiler/ProfilerRegistry.java M slf4j-ext/src/main/java/org/slf4j/profiler/SpacePadder.java M slf4j-ext/src/main/java/org/slf4j/profiler/StopWatch.java M slf4j-ext/src/main/java/org/slf4j/profiler/TimeInstrument.java M slf4j-ext/src/main/java/org/slf4j/profiler/TimeInstrumentStatus.java M slf4j-ext/src/main/java/org/slf4j/profiler/Util.java M slf4j-ext/src/test/java/org/slf4j/NDCTest.java M slf4j-ext/src/test/java/org/slf4j/cal10n_dummy/LocLoggerTest.java M slf4j-ext/src/test/java/org/slf4j/cal10n_dummy/Months.java M slf4j-ext/src/test/java/org/slf4j/cal10n_dummy/MyApplication.java M slf4j-ext/src/test/java/org/slf4j/cal10n_dummy/PackageTest.java M slf4j-ext/src/test/java/org/slf4j/cal10n_dummy/Production.java M slf4j-ext/src/test/java/org/slf4j/dummyExt/EventLoggerTest.java M slf4j-ext/src/test/java/org/slf4j/dummyExt/ListAppender.java M slf4j-ext/src/test/java/org/slf4j/dummyExt/MDCStrLookupTest.java M slf4j-ext/src/test/java/org/slf4j/dummyExt/PackageTest.java M slf4j-ext/src/test/java/org/slf4j/dummyExt/XLoggerTest.java M slf4j-ext/src/test/java/org/slf4j/instrumentation/ToStringHelperTest.java M slf4j-ext/src/test/java/org/slf4j/profiler/BasicProfilerDemo.java M slf4j-ext/src/test/java/org/slf4j/profiler/NestedProfilerDemo.java M slf4j-ext/src/test/java/org/slf4j/profiler/NestedProfilerDemo2.java M slf4j-ext/src/test/java/org/slf4j/profiler/PackageTest.java M slf4j-ext/src/test/java/org/slf4j/profiler/ProfilerTest.java M slf4j-ext/src/test/java/org/slf4j/profiler/RandomIntegerArrayGenerator.java M slf4j-ext/src/test/java/org/slf4j/profiler/SortAndPruneComposites.java M slf4j-ext/src/test/java/org/slf4j/profiler/UtilTest.java M slf4j-jcl/pom.xml M slf4j-jcl/src/main/java/org/slf4j/impl/JCLLoggerAdapter.java M slf4j-jcl/src/main/java/org/slf4j/impl/JCLLoggerFactory.java M slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java M slf4j-jcl/src/main/java/org/slf4j/impl/StaticMDCBinder.java M slf4j-jcl/src/main/java/org/slf4j/impl/StaticMarkerBinder.java M slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF M slf4j-jcl/src/test/java/org/slf4j/InvocationTest.java M slf4j-jdk14/pom.xml M slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java M slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerFactory.java M slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java M slf4j-jdk14/src/main/java/org/slf4j/impl/StaticMDCBinder.java M slf4j-jdk14/src/main/java/org/slf4j/impl/StaticMarkerBinder.java M slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF M slf4j-jdk14/src/test/java/org/slf4j/InvocationTest.java M slf4j-jdk14/src/test/java/org/slf4j/impl/JDK14AdapterLoggerNameTest.java M slf4j-jdk14/src/test/java/org/slf4j/impl/PerfTest.java M slf4j-jdk14/src/test/java/org/slf4j/issue/LoggerSerializationTest.java M slf4j-log4j12/pom.xml M slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerAdapter.java M slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerFactory.java M slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jMDCAdapter.java M slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java M slf4j-log4j12/src/main/java/org/slf4j/impl/StaticMDCBinder.java M slf4j-log4j12/src/main/java/org/slf4j/impl/StaticMarkerBinder.java M slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF M slf4j-log4j12/src/test/java/org/slf4j/InvocationTest.java M slf4j-log4j12/src/test/java/org/slf4j/ListAppender.java M slf4j-log4j12/src/test/java/org/slf4j/impl/RecursiveAppender.java M slf4j-log4j12/src/test/java/org/slf4j/impl/RecursiveInitializationTest.java M slf4j-migrator/pom.xml M slf4j-migrator/src/main/java/org/slf4j/migrator/Constant.java M slf4j-migrator/src/main/java/org/slf4j/migrator/ConversionException.java M slf4j-migrator/src/main/java/org/slf4j/migrator/FileSelector.java M slf4j-migrator/src/main/java/org/slf4j/migrator/InplaceFileConverter.java M slf4j-migrator/src/main/java/org/slf4j/migrator/Main.java M slf4j-migrator/src/main/java/org/slf4j/migrator/ProjectConverter.java M slf4j-migrator/src/main/java/org/slf4j/migrator/RuleSetFactory.java M slf4j-migrator/src/main/java/org/slf4j/migrator/helper/Abbreviator.java M slf4j-migrator/src/main/java/org/slf4j/migrator/helper/SpringLayoutHelper.java M slf4j-migrator/src/main/java/org/slf4j/migrator/internal/ConversionTask.java M slf4j-migrator/src/main/java/org/slf4j/migrator/internal/MigratorFrame.java M slf4j-migrator/src/main/java/org/slf4j/migrator/internal/ProgressListener.java M slf4j-migrator/src/main/java/org/slf4j/migrator/internal/ProgressListenerImpl.java M slf4j-migrator/src/main/java/org/slf4j/migrator/line/ConversionRule.java M slf4j-migrator/src/main/java/org/slf4j/migrator/line/EmptyRuleSet.java M slf4j-migrator/src/main/java/org/slf4j/migrator/line/JCLRuleSet.java M slf4j-migrator/src/main/java/org/slf4j/migrator/line/JULRuleSet.java M slf4j-migrator/src/main/java/org/slf4j/migrator/line/LineConverter.java M slf4j-migrator/src/main/java/org/slf4j/migrator/line/Log4jRuleSet.java M slf4j-migrator/src/main/java/org/slf4j/migrator/line/MultiGroupConversionRule.java M slf4j-migrator/src/main/java/org/slf4j/migrator/line/RuleSet.java M slf4j-migrator/src/main/java/org/slf4j/migrator/line/SingleConversionRule.java M slf4j-migrator/src/test/java/org/slf4j/migrator/AllTest.java M slf4j-migrator/src/test/java/org/slf4j/migrator/AternativeApproach.java M slf4j-migrator/src/test/java/org/slf4j/migrator/FileConverterTest.java M slf4j-migrator/src/test/java/org/slf4j/migrator/PackageTest.java M slf4j-migrator/src/test/java/org/slf4j/migrator/ProjectConverterTest.java M slf4j-migrator/src/test/java/org/slf4j/migrator/helper/AbbreviatorTest.java M slf4j-migrator/src/test/java/org/slf4j/migrator/helper/PackageTest.java M slf4j-migrator/src/test/java/org/slf4j/migrator/helper/RandomHelper.java M slf4j-migrator/src/test/java/org/slf4j/migrator/internal/NopProgressListener.java M slf4j-migrator/src/test/java/org/slf4j/migrator/line/JCLRuleSetTest.java M slf4j-migrator/src/test/java/org/slf4j/migrator/line/Log4jRuleSetTest.java M slf4j-migrator/src/test/java/org/slf4j/migrator/line/NoConversionTest.java M slf4j-migrator/src/test/java/org/slf4j/migrator/line/PackageTest.java M slf4j-migrator/src/test/java/org/slf4j/migrator/line/TrivialMatcher.java M slf4j-migrator/src/test/java/org/slf4j/migrator/line/TrivialMatcherTest.java M slf4j-nop/pom.xml M slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java M slf4j-nop/src/main/java/org/slf4j/impl/StaticMDCBinder.java M slf4j-nop/src/main/java/org/slf4j/impl/StaticMarkerBinder.java M slf4j-nop/src/main/resources/META-INF/MANIFEST.MF M slf4j-nop/src/test/java/org/slf4j/InvocationTest.java M slf4j-simple/pom.xml M slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java M slf4j-simple/src/main/java/org/slf4j/impl/SimpleLoggerFactory.java M slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java M slf4j-simple/src/main/java/org/slf4j/impl/StaticMDCBinder.java M slf4j-simple/src/main/java/org/slf4j/impl/StaticMarkerBinder.java M slf4j-simple/src/main/resources/META-INF/MANIFEST.MF M slf4j-simple/src/test/java/org/slf4j/DetectLoggerNameMismatchTest.java M slf4j-simple/src/test/java/org/slf4j/InvocationTest.java M slf4j-simple/src/test/java/org/slf4j/SilentPrintStream.java M slf4j-simple/src/test/java/org/slf4j/impl/SimpleLoggerTest.java M slf4j-site/pom.xml M slf4j-site/src/site/pages/bug-reporting.html M slf4j-site/src/site/pages/css/site.css M slf4j-site/src/site/pages/news.html M slf4j-site/src/site/pages/templates/footer.js M slf4j-site/src/site/pages/templates/left.js Log Message: ----------- Merge remote-tracking branch 'upstream/master' Resolved formatting changes for BasicMDCAdapater.java Commit: 32783459528cc64ad1253c641bc1d03155801399 https://github.com/qos-ch/slf4j/commit/32783459528cc64ad1253c641bc1d03155801... Author: Luke Cwik <lcwik@google.com> Date: 2015-07-06 (Mon, 06 Jul 2015) Changed paths: A integration/src/main/resources/META-INF/MANIFEST.MF M jcl-over-slf4j/pom.xml M jul-to-slf4j/pom.xml M jul-to-slf4j/src/main/java/org/slf4j/bridge/SLF4JBridgeHandler.java M log4j-over-slf4j/pom.xml M log4j-over-slf4j/src/main/java/org/apache/log4j/Appender.java M log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java M log4j-over-slf4j/src/main/java/org/apache/log4j/LogManager.java R log4j-over-slf4j/src/main/java/org/apache/log4j/spi/Layout.java M pom.xml M slf4j-android/pom.xml M slf4j-api/pom.xml M slf4j-api/src/main/java/org/slf4j/LoggerFactory.java M slf4j-api/src/main/java/org/slf4j/MDC.java M slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java M slf4j-api/src/main/java/org/slf4j/helpers/BasicMarker.java M slf4j-ext/pom.xml M slf4j-ext/src/main/java/org/slf4j/ext/XLogger.java M slf4j-ext/src/test/java/org/slf4j/dummyExt/XLoggerTest.java M slf4j-jcl/pom.xml M slf4j-jdk14/pom.xml M slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java M slf4j-jdk14/src/test/java/org/slf4j/issue/LoggerSerializationTest.java M slf4j-log4j12/pom.xml M slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerAdapter.java M slf4j-log4j12/src/test/java/org/slf4j/InvocationTest.java M slf4j-migrator/pom.xml M slf4j-nop/pom.xml M slf4j-simple/pom.xml M slf4j-simple/src/test/java/org/slf4j/InvocationTest.java M slf4j-site/pom.xml A slf4j-site/src/main/resources/META-INF/MANIFEST.MF Log Message: ----------- Merge remote-tracking branch 'upstream/master' Fix merge conflict in BasicMDCAdapter.java Commit: fd5d546503b1b7ba3d865382da2a0dbda0c13cb3 https://github.com/qos-ch/slf4j/commit/fd5d546503b1b7ba3d865382da2a0dbda0c13... Author: Ceki Gulcu <ceki@qos.ch> Date: 2015-11-06 (Fri, 06 Nov 2015) Changed paths: M slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java A slf4j-api/src/test/java/org/slf4j/helpers/BasicMDCAdapterTest.java Log Message: ----------- Merge pull request #99 from lukecwik/master Fixed BasicMDCAdapter leaks MDC information to non-child threads Compare: https://github.com/qos-ch/slf4j/compare/52fcbbe855fb...fd5d546503b1