[libslf4j-java] 01/02: Merge tag 'upstream/1.7.20'

[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 17951249fafc88703430b46db6f1b66f325b5167
Merge: ec1e7de 132b2cd
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 31 09:45:35 2016 +0200

    Merge tag 'upstream/1.7.20'
    
    Upstream version 1.7.20

 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     |  2 +-
 .../test/java/org/slf4j/LoggerAccessingThread.java | 57 +++++++++++++
 slf4j-ext/pom.xml                                  |  2 +-
 slf4j-jcl/pom.xml                                  |  2 +-
 slf4j-jdk14/pom.xml                                |  2 +-
 .../java/org/slf4j/impl/JDK14LoggerFactory.java    |  5 +-
 ...{RecordingHandler.java => CountingHandler.java} | 12 ++-
 ...a => JDK14MultithreadedInitializationTest.java} | 96 ++++++++--------------
 slf4j-log4j12/pom.xml                              | 10 ++-
 ...=> Log4j12MultithreadedInitializationTest.java} | 61 +++++---------
 slf4j-migrator/pom.xml                             |  2 +-
 slf4j-nop/pom.xml                                  |  2 +-
 slf4j-simple/pom.xml                               | 10 ++-
 ...mpleLoggerMultithreadedInitializationTest.java} | 92 +++++++++------------
 slf4j-site/pom.xml                                 |  2 +-
 23 files changed, 192 insertions(+), 181 deletions(-)

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