Merge branch 'master' into LOG4J2-1623
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3064471e Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3064471e Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3064471e Branch: refs/heads/master Commit: 3064471eaa1b7f7d3c5e38349281e1ccdd054cfa Parents: c92c327 2da9dfa Author: Mikael Ståldal <mikael.stal...@magine.com> Authored: Thu Oct 6 13:29:28 2016 +0200 Committer: Mikael Ståldal <mikael.stal...@magine.com> Committed: Thu Oct 6 13:29:28 2016 +0200 ---------------------------------------------------------------------- log4j-bom/pom.xml | 4 ---- .../main/java/org/apache/logging/log4j/core/LoggerContext.java | 2 +- .../java/org/apache/logging/log4j/core/util/CyclicBuffer.java | 4 ++-- .../org/apache/logging/log4j/core/util/ExecutorServices.java | 4 ++-- src/site/site.xml | 1 + src/site/xdoc/javadoc.xml | 4 ++++ 6 files changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3064471e/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java ----------------------------------------------------------------------
