Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/140e4c76 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/140e4c76 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/140e4c76 Branch: refs/heads/LOG4J-1181 Commit: 140e4c76c0b1adceb2656618b4746cf25f9f9e14 Parents: 065b8e0 2c4bdbb Author: rpopma <rpo...@apache.org> Authored: Tue May 31 23:28:45 2016 +0900 Committer: rpopma <rpo...@apache.org> Committed: Tue May 31 23:28:45 2016 +0900 ---------------------------------------------------------------------- BUILDING.txt | 96 ++++++++++--------- .../org/apache/logging/log4j/util/Unbox.java | 16 ++-- log4j-bom/.gitignore | 1 + .../log4j/core/layout/CsvLogEventLayout.java | 35 +++---- .../log4j/core/layout/CsvParameterLayout.java | 6 +- pom.xml | 4 +- src/changes/changes.xml | 11 +++ src/site/resources/logo/logo-3d-green-bg-2.png | Bin 0 -> 33619 bytes src/site/resources/logo/logo-3d-green-bg-2.xcf | Bin 0 -> 58311 bytes src/site/resources/logo/logo-3d-green-bg.png | Bin 0 -> 32865 bytes src/site/resources/logo/logo-3d-green-bg.xcf | Bin 0 -> 58333 bytes src/site/resources/logo/logo-big-blue.png | Bin 0 -> 30347 bytes src/site/resources/logo/logo-big-blue.xcf | Bin 0 -> 55133 bytes src/site/resources/logo/logo-blue-web-r2.6.png | Bin 0 -> 38268 bytes src/site/resources/logo/logo-blue-web-r2.6.xcf | Bin 0 -> 64192 bytes src/site/resources/logo/logo-blue-web.png | Bin 0 -> 35254 bytes src/site/resources/logo/logo-blue-web.xcf | Bin 0 -> 63386 bytes .../resources/logo/logo-chocolate-swirl-2.png | Bin 0 -> 31842 bytes .../resources/logo/logo-chocolate-swirl-2.xcf | Bin 0 -> 58254 bytes .../resources/logo/logo-chocolate-swirl.png | Bin 0 -> 34753 bytes .../resources/logo/logo-chocolate-swirl.xcf | Bin 0 -> 64646 bytes src/site/resources/logo/logo-craters-2.png | Bin 0 -> 30522 bytes src/site/resources/logo/logo-craters-2.xcf | Bin 0 -> 58393 bytes src/site/resources/logo/logo-craters.png | Bin 0 -> 32590 bytes src/site/resources/logo/logo-craters.xcf | Bin 0 -> 58716 bytes src/site/resources/logo/logo-electric-blue.png | Bin 0 -> 31853 bytes src/site/resources/logo/logo-electric-blue.xcf | Bin 0 -> 58321 bytes src/site/resources/logo/logo-granite-2.png | Bin 0 -> 33714 bytes src/site/resources/logo/logo-granite-2.xcf | Bin 0 -> 58695 bytes src/site/resources/logo/logo-granite.png | Bin 0 -> 31959 bytes src/site/resources/logo/logo-granite.xcf | Bin 0 -> 58354 bytes src/site/resources/logo/logo-ice.png | Bin 0 -> 33947 bytes src/site/resources/logo/logo-ice.xcf | Bin 0 -> 64835 bytes src/site/resources/logo/logo-java-1.png | Bin 0 -> 33698 bytes src/site/resources/logo/logo-java-1.xcf | Bin 0 -> 58663 bytes src/site/resources/logo/logo-java-2.png | Bin 0 -> 36999 bytes src/site/resources/logo/logo-java-2.xcf | Bin 0 -> 64767 bytes src/site/resources/logo/logo-java-3.png | Bin 0 -> 33016 bytes src/site/resources/logo/logo-java-3.xcf | Bin 0 -> 58335 bytes src/site/resources/logo/logo-leather-2.png | Bin 0 -> 33766 bytes src/site/resources/logo/logo-leather-2.xcf | Bin 0 -> 58757 bytes src/site/resources/logo/logo-leather.png | Bin 0 -> 32668 bytes src/site/resources/logo/logo-leather.xcf | Bin 0 -> 58406 bytes src/site/resources/logo/logo-lightning.png | Bin 0 -> 38593 bytes src/site/resources/logo/logo-lightning.xcf | Bin 0 -> 64749 bytes src/site/resources/logo/logo-marble-1.png | Bin 0 -> 33208 bytes src/site/resources/logo/logo-marble-1.xcf | Bin 0 -> 64833 bytes src/site/resources/logo/logo-paper-1.png | Bin 0 -> 33016 bytes src/site/resources/logo/logo-paper-1.xcf | Bin 0 -> 58337 bytes src/site/resources/logo/logo-paper-2.png | Bin 0 -> 33082 bytes src/site/resources/logo/logo-paper-2.xcf | Bin 0 -> 58324 bytes src/site/resources/logo/logo-parque-1.png | Bin 0 -> 33676 bytes src/site/resources/logo/logo-parque-1.xcf | Bin 0 -> 58334 bytes src/site/resources/logo/logo-parque-2.png | Bin 0 -> 32530 bytes src/site/resources/logo/logo-parque-2.xcf | Bin 0 -> 58370 bytes src/site/resources/logo/logo-parque-3.png | Bin 0 -> 32927 bytes src/site/resources/logo/logo-parque-3.xcf | Bin 0 -> 58348 bytes src/site/resources/logo/logo-pastel-stuff-2.png | Bin 0 -> 33441 bytes src/site/resources/logo/logo-pastel-stuff-2.xcf | Bin 0 -> 58354 bytes src/site/resources/logo/logo-pastel-stuff-3.png | Bin 0 -> 33194 bytes src/site/resources/logo/logo-pastel-stuff-3.xcf | Bin 0 -> 58367 bytes src/site/resources/logo/logo-pastel-stuff.png | Bin 0 -> 37102 bytes src/site/resources/logo/logo-pastel-stuff.xcf | Bin 0 -> 64784 bytes src/site/resources/logo/logo-pine.png | Bin 0 -> 28260 bytes src/site/resources/logo/logo-pine.xcf | Bin 0 -> 61254 bytes src/site/resources/logo/logo-pool-bottom-bg.png | Bin 0 -> 31480 bytes src/site/resources/logo/logo-pool-bottom-bg.xcf | Bin 0 -> 58386 bytes src/site/resources/logo/logo-pool-bottom.png | Bin 0 -> 33961 bytes src/site/resources/logo/logo-pool-bottom.xcf | Bin 0 -> 64819 bytes src/site/resources/logo/logo-qbert.png | Bin 0 -> 34606 bytes src/site/resources/logo/logo-qbert.xcf | Bin 0 -> 64777 bytes src/site/resources/logo/logo-rain.png | Bin 0 -> 34527 bytes src/site/resources/logo/logo-rain.xcf | Bin 0 -> 64686 bytes src/site/resources/logo/logo-red-cubes.png | Bin 0 -> 32485 bytes src/site/resources/logo/logo-red-cubes.xcf | Bin 0 -> 58334 bytes src/site/resources/logo/logo-rocks.png | Bin 0 -> 39238 bytes src/site/resources/logo/logo-rocks.xcf | Bin 0 -> 64798 bytes src/site/resources/logo/logo-sky.png | Bin 0 -> 33307 bytes src/site/resources/logo/logo-sky.xcf | Bin 0 -> 64206 bytes src/site/resources/logo/logo-starfield.png | Bin 0 -> 30603 bytes src/site/resources/logo/logo-starfield.xcf | Bin 0 -> 56479 bytes src/site/resources/logo/logo-stone.png | Bin 0 -> 39696 bytes src/site/resources/logo/logo-stone.xcf | Bin 0 -> 64755 bytes src/site/resources/logo/logo-tree-bark.png | Bin 0 -> 40313 bytes src/site/resources/logo/logo-tree-bark.xcf | Bin 0 -> 64751 bytes src/site/resources/logo/logo-walnut.png | Bin 0 -> 35644 bytes src/site/resources/logo/logo-walnut.xcf | Bin 0 -> 64852 bytes src/site/resources/logo/logo-wood-1.png | Bin 0 -> 34322 bytes src/site/resources/logo/logo-wood-1.xcf | Bin 0 -> 64867 bytes src/site/resources/logo/logo-wood-2.png | Bin 0 -> 33795 bytes src/site/resources/logo/logo-wood-2.xcf | Bin 0 -> 64846 bytes src/site/resources/logo/logo-wood.png | Bin 0 -> 37241 bytes src/site/resources/logo/logo-wood.xcf | Bin 0 -> 64930 bytes src/site/xdoc/manual/appenders.xml | 3 +- src/site/xdoc/runtime-dependencies.xml | 3 +- 95 files changed, 95 insertions(+), 80 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/140e4c76/src/site/xdoc/manual/appenders.xml ----------------------------------------------------------------------
