You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2017/05/23 08:49:49 UTC
[06/14] logging-log4j2 git commit: Merge branch 'master' into
LOG4J2-1442
Merge branch 'master' into LOG4J2-1442
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/bcb72644
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/bcb72644
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/bcb72644
Branch: refs/heads/master
Commit: bcb7264491b89a4cb9f672a276cc00ff48c484cd
Parents: 7f9f60b 68e43b8
Author: Mikael Ståldal <mi...@magine.com>
Authored: Wed May 10 14:12:34 2017 +0200
Committer: Mikael Ståldal <mi...@magine.com>
Committed: Wed May 10 14:12:34 2017 +0200
----------------------------------------------------------------------
.travis-toolchains.xml | 37 +++
.travis.yml | 20 +-
BUILDING.md | 12 +-
.../java/org/apache/logging/log4j/Timer.java | 25 +-
.../logging/log4j/core/SimplePerfTest.java | 2 +-
.../logging/log4j/core/ThreadedPerfTest.java | 2 +-
.../net/ssl/AbstractKeyStoreConfiguration.java | 4 +
.../core/net/ssl/KeyStoreConfiguration.java | 4 +
.../log4j/core/net/ssl/SslConfiguration.java | 16 ++
.../log4j/core/net/ssl/StoreConfiguration.java | 44 ++-
.../core/net/ssl/TrustStoreConfiguration.java | 4 +
.../logging/log4j/core/util/WatchManager.java | 6 +
.../apache/logging/log4j/core/util/Timer.java | 273 -------------------
pom.xml | 10 +-
src/changes/changes.xml | 9 +
src/site/markdown/build.md | 18 +-
src/site/site.xml | 7 +-
toolchains-sample-linux.xml | 52 ++++
toolchains-sample-mac.xml | 52 ++++
toolchains-sample-win.xml | 52 ++++
toolchains-sample.xml | 52 ----
21 files changed, 320 insertions(+), 381 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bcb72644/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bcb72644/src/changes/changes.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bcb72644/src/site/site.xml
----------------------------------------------------------------------