You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2018/04/08 19:31:37 UTC

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

Branch: refs/heads/master
Commit: 3d7f546ae96359158abfc6302803915fc2d2c632
Parents: faf996f 04daf2a
Author: Gary Gregory <ga...@gmail.com>
Authored: Sun Apr 8 13:31:14 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Sun Apr 8 13:31:14 2018 -0600

----------------------------------------------------------------------
 .travis-toolchains.xml                       |  11 -
 .travis.yml                                  |  23 +-
 Jenkinsfile                                  |  15 +-
 src/site/asciidoc/manual/async.adoc          | 626 ++++++++++++++++
 src/site/asciidoc/manual/eventlogging.adoc   | 142 ++++
 src/site/asciidoc/manual/flowtracing.adoc    | 275 +++++++
 src/site/asciidoc/manual/index.adoc          | 138 ++++
 src/site/asciidoc/manual/markers.adoc        | 104 +++
 src/site/asciidoc/manual/messages.adoc       | 333 +++++++++
 src/site/asciidoc/manual/scala-api.adoc      |  80 ++
 src/site/asciidoc/manual/thread-context.adoc | 233 ++++++
 src/site/xdoc/manual/async.xml               | 848 ----------------------
 src/site/xdoc/manual/eventlogging.xml        | 145 ----
 src/site/xdoc/manual/flowtracing.xml         | 268 -------
 src/site/xdoc/manual/index.xml               | 150 ----
 src/site/xdoc/manual/markers.xml             | 110 ---
 src/site/xdoc/manual/messages.xml            | 314 --------
 src/site/xdoc/manual/scala-api.xml           |  93 ---
 src/site/xdoc/manual/thread-context.xml      | 209 ------
 toolchains-jenkins-ibm.xml                   |  63 ++
 20 files changed, 2026 insertions(+), 2154 deletions(-)
----------------------------------------------------------------------