Merge branch 'master' 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/e2b6ca4d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e2b6ca4d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e2b6ca4d Branch: refs/heads/LOG4J-1181 Commit: e2b6ca4da37141aa4ab6fa82e0d164cab0a8b239 Parents: b9bc02c 3200bbe Author: Mikael Ståldal <[email protected]> Authored: Wed Nov 11 11:00:45 2015 +0100 Committer: Mikael Ståldal <[email protected]> Committed: Wed Nov 11 11:00:45 2015 +0100 ---------------------------------------------------------------------- .../core/appender/mom/kafka/KafkaAppender.java | 3 +- .../log4j/core/config/DefaultConfiguration.java | 2 + .../log4j/core/layout/AbstractCsvLayout.java | 3 +- .../log4j/core/layout/AbstractStringLayout.java | 82 +------------- .../log4j/core/layout/PatternLayout.java | 3 +- .../logging/log4j/core/util/StringEncoder.java | 111 +++++++++++++++++++ log4j-core/src/site/xdoc/index.xml | 23 +--- pom.xml | 18 ++- src/site/resources/images/YourKitLogo.png | Bin 0 -> 5554 bytes src/site/site.xml | 1 + src/site/xdoc/faq.xml | 13 ++- src/site/xdoc/manual/configuration.xml.vm | 2 + src/site/xdoc/runtime-dependencies.xml | 24 +++- src/site/xdoc/thanks.xml | 103 +++++++++++++++++ 14 files changed, 279 insertions(+), 109 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e2b6ca4d/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e2b6ca4d/src/site/site.xml ----------------------------------------------------------------------
