[libslf4j-java] 02/03: Merge tag 'upstream/1.7.21'

[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 37072a550fb98ce39c48b007d91110d630992757
Merge: f2800b3 825ef95
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Apr 11 00:41:20 2016 +0200

    Merge tag 'upstream/1.7.21'
    
    Upstream version 1.7.21

 integration/pom.xml                                |  2 +-
 jcl-over-slf4j/pom.xml                             |  2 +-
 jul-to-slf4j/pom.xml                               |  2 +-
 log4j-over-slf4j/pom.xml                           |  2 +-
 osgi-over-slf4j/pom.xml                            |  2 +-
 pom.xml                                            |  2 +-
 slf4j-android/pom.xml                              |  2 +-
 slf4j-api/pom.xml                                  |  2 +-
 .../src/main/java/org/slf4j/LoggerFactory.java     | 78 +++++++++++++--------
 .../java/org/slf4j/helpers/SubstituteLogger.java   | 14 +++-
 .../org/slf4j/helpers/SubstituteLoggerFactory.java | 20 +++---
 .../slf4j/FindStaticLoggerBinderPathsPerfTest.hava | 55 ---------------
 .../test/java/org/slf4j/LoggerAccessingThread.java |  9 ++-
 .../helpers/MultithreadedInitializationTest.java   | 81 ++++++++++++++++++++++
 .../org/slf4j/helpers/SubstitutableLoggerTest.java |  3 +-
 slf4j-ext/pom.xml                                  |  2 +-
 slf4j-jcl/pom.xml                                  |  2 +-
 slf4j-jdk14/pom.xml                                |  2 +-
 .../slf4j/{impl => helpers}/CountingHandler.java   |  2 +-
 .../JDK14MultithreadedInitializationTest.java      | 53 +-------------
 slf4j-log4j12/pom.xml                              |  2 +-
 .../Log4j12MultithreadedInitializationTest.java    | 65 +++++------------
 slf4j-migrator/pom.xml                             |  2 +-
 slf4j-nop/pom.xml                                  |  2 +-
 slf4j-simple/pom.xml                               |  2 +-
 ...impleLoggerMultithreadedInitializationTest.java | 72 ++++++-------------
 slf4j-site/pom.xml                                 |  2 +-
 27 files changed, 220 insertions(+), 264 deletions(-)

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