Merge branch 'master' into LOG4J2-2076

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/98a66a14
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/98a66a14
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/98a66a14

Branch: refs/heads/master
Commit: 98a66a14561e7b1525a98080be1362e0243a56d4
Parents: e54e250 f05b1aa
Author: Mikael Ståldal <mik...@staldal.nu>
Authored: Thu Oct 19 21:16:18 2017 +0200
Committer: Mikael Ståldal <mik...@staldal.nu>
Committed: Thu Oct 19 21:16:18 2017 +0200

----------------------------------------------------------------------
 .../org/apache/logging/log4j/core/layout/CsvParameterLayout.java  | 2 +-
 src/changes/changes.xml                                           | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


Reply via email to