You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2015/02/22 12:53:27 UTC

[2/3] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git

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/af0c8ce8
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/af0c8ce8
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/af0c8ce8

Branch: refs/heads/master
Commit: af0c8ce83693392d1708a1995c20fcaa722cd6f9
Parents: d13b981 84b55aa
Author: rpopma <rp...@apache.org>
Authored: Sun Feb 22 20:34:02 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sun Feb 22 20:34:02 2015 +0900

----------------------------------------------------------------------
 .../src/main/java/org/apache/logging/log4j/Level.java  |  2 +-
 .../org/apache/logging/log4j/core/config/Property.java | 13 +++++++------
 pom.xml                                                |  2 +-
 src/changes/changes.xml                                | 12 ++++++++++++
 src/site/xdoc/manual/appenders.xml                     |  6 +++---
 src/site/xdoc/manual/configuration.xml.vm              |  8 ++++----
 6 files changed, 28 insertions(+), 15 deletions(-)
----------------------------------------------------------------------