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/06215dca Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/06215dca Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/06215dca Branch: refs/heads/master Commit: 06215dcad2b00eff3f31fd1f4ceb87084efd5484 Parents: 88f0d01 daee605 Author: rpopma <[email protected]> Authored: Sun Sep 21 19:35:06 2014 +0900 Committer: rpopma <[email protected]> Committed: Sun Sep 21 19:35:06 2014 +0900 ---------------------------------------------------------------------- .../log4j/core/lookup/AbstractLookup.java | 36 ++++++++++++++++++++ .../log4j/core/lookup/EnvironmentLookup.java | 12 +------ .../logging/log4j/core/lookup/Interpolator.java | 19 +---------- .../logging/log4j/core/lookup/JndiLookup.java | 12 +------ .../log4j/core/lookup/ResourceBundleLookup.java | 24 +++---------- .../core/lookup/SystemPropertiesLookup.java | 20 +++-------- .../core/lookup/SystemPropertiesLookupTest.java | 1 - .../org/apache/logging/log4j/web/WebLookup.java | 12 ++----- 8 files changed, 52 insertions(+), 84 deletions(-) ----------------------------------------------------------------------
