Merge remote-tracking branch 'origin/LOG4J-1181' into LOG4J-1181
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3c6fa163 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3c6fa163 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3c6fa163 Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure Commit: 3c6fa163acb5598c7da44238a9154ed7f503f629 Parents: b3bc8e9 5c9a387 Author: Mikael Ståldal <mik...@staldal.nu> Authored: Sat Aug 27 11:46:55 2016 +0200 Committer: Mikael Ståldal <mik...@staldal.nu> Committed: Sat Aug 27 11:46:55 2016 +0200 ---------------------------------------------------------------------- log4j-api-scala_2.10/pom.xml | 2 +- .../org/apache/logging/log4j/scala/Logger.scala | 16 +++--- .../apache/logging/log4j/scala/LoggerTest.scala | 52 +++----------------- log4j-api-scala_2.11/pom.xml | 4 +- .../org/apache/logging/log4j/scala/Logger.scala | 16 +++--- .../apache/logging/log4j/scala/LoggerTest.scala | 52 +++----------------- log4j-samples/scala-api/pom.xml | 2 +- 7 files changed, 30 insertions(+), 114 deletions(-) ----------------------------------------------------------------------