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/5a77ddf8 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5a77ddf8 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5a77ddf8 Branch: refs/heads/master Commit: 5a77ddf8ad74575b942dee80132f51388d0ac993 Parents: 6ebe102 33407b2 Author: Gary Gregory <ggreg...@apache.org> Authored: Tue Jun 28 11:40:10 2016 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Tue Jun 28 11:40:10 2016 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/logging/log4j/Logger.java | 11 +++++------ .../log4j/core/filter/DynamicThresholdFilter.java | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
