[libslf4j-java] 02/05: Merge tag 'upstream/1.7.14'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libslf4j-java.

commit 40b4b1b54ebfc36d0f4ccd46d2924e9f1031fc88
Merge: 87dd011 9119821
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jan 28 13:04:12 2016 +0100

    Merge tag 'upstream/1.7.14'
    
    Upstream version 1.7.14

 integration/pom.xml                                |   2 +-
 jcl-over-slf4j/pom.xml                             |   2 +-
 jul-to-slf4j/pom.xml                               |   2 +-
 log4j-over-slf4j/pom.xml                           |   2 +-
 .../java/org/apache/log4j/Log4jLoggerFactory.java  |  18 ---
 osgi-over-slf4j/pom.xml                            |  20 +--
 .../src/main/resources/META-INF/MANIFEST.MF        |   8 ++
 pom.xml                                            |   6 +-
 slf4j-android/pom.xml                              |   2 +-
 .../java/org/slf4j/impl/StaticLoggerBinder.java    |   7 +-
 .../main/java/org/slf4j/impl/StaticMDCBinder.java  |   9 ++
 .../java/org/slf4j/impl/StaticMarkerBinder.java    |  10 ++
 slf4j-api/pom.xml                                  |   2 +-
 .../src/main/java/org/slf4j/LoggerFactory.java     |  24 +++-
 slf4j-api/src/main/java/org/slf4j/MDC.java         |  20 ++-
 .../src/main/java/org/slf4j/MarkerFactory.java     |  32 ++++-
 .../java/org/slf4j/impl/StaticLoggerBinder.java    |   2 +-
 .../main/java/org/slf4j/impl/StaticMDCBinder.java  |  10 ++
 .../java/org/slf4j/impl/StaticMarkerBinder.java    |  10 ++
 .../src/test/java/org/slf4j/DoubleCheckedInt.java  | 141 +++++++++++++++++++++
 .../slf4j/FindStaticLoggerBinderPathsPerfTest.java |  55 ++++++++
 slf4j-ext/pom.xml                                  |   2 +-
 slf4j-jcl/pom.xml                                  |   2 +-
 .../main/java/org/slf4j/impl/JCLLoggerFactory.java |   4 +-
 .../java/org/slf4j/impl/StaticLoggerBinder.java    |   8 +-
 .../main/java/org/slf4j/impl/StaticMDCBinder.java  |  11 ++
 .../java/org/slf4j/impl/StaticMarkerBinder.java    |  10 ++
 slf4j-jdk14/pom.xml                                |   2 +-
 .../java/org/slf4j/impl/StaticLoggerBinder.java    |   2 +-
 .../main/java/org/slf4j/impl/StaticMDCBinder.java  |  12 +-
 .../java/org/slf4j/impl/StaticMarkerBinder.java    |  10 ++
 slf4j-log4j12/pom.xml                              |   2 +-
 .../java/org/slf4j/impl/Log4jLoggerFactory.java    |  18 +++
 .../java/org/slf4j/impl/StaticLoggerBinder.java    |   4 +-
 .../main/java/org/slf4j/impl/StaticMDCBinder.java  |  12 +-
 .../java/org/slf4j/impl/StaticMarkerBinder.java    |  10 ++
 slf4j-migrator/pom.xml                             |   2 +-
 slf4j-nop/pom.xml                                  |   2 +-
 .../java/org/slf4j/impl/StaticLoggerBinder.java    |   2 +-
 .../main/java/org/slf4j/impl/StaticMDCBinder.java  |  10 ++
 .../java/org/slf4j/impl/StaticMarkerBinder.java    |  10 ++
 slf4j-simple/pom.xml                               |   2 +-
 .../java/org/slf4j/impl/StaticLoggerBinder.java    |   4 +-
 .../main/java/org/slf4j/impl/StaticMDCBinder.java  |  10 ++
 .../java/org/slf4j/impl/StaticMarkerBinder.java    |  12 +-
 slf4j-site/pom.xml                                 |  44 +++++++
 slf4j-site/src/main/resources/META-INF/MANIFEST.MF |   0
 47 files changed, 509 insertions(+), 82 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libslf4j-java.git