[logback] 01/02: Merge tag 'upstream/1.1.9'

[Emmanuel Bourg]

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

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

commit b5b57733041f4d23363d8607fc914ef38059bf31
Merge: 17fb2a2 325d0e9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 23 17:41:49 2017 +0100

    Merge tag 'upstream/1.1.9'
    
    Upstream version 1.1.9

 docs/access.html                                   |   4 +-
 docs/cla.txt                                       |  13 +-
 docs/download.html                                 |  46 ++++---
 docs/faq.html                                      |   6 +-
 docs/license.html                                  |   2 +-
 docs/manual/appenders.html                         |   4 +-
 docs/manual/configuration.html                     |   7 +-
 docs/manual/groovy_ja.html                         |   4 +-
 docs/manual/introduction.html                      |   2 +-
 docs/manual/loggingSeparation.html                 |   6 +-
 docs/manual/onJoran.html                           |   2 +-
 docs/news.html                                     |  42 +++++-
 docs/project-reports.html                          |  10 +-
 docs/setup.html                                    |  20 +--
 docs/templates/footer.js                           |   2 +-
 logback-access/pom.xml                             |   2 +-
 .../qos/logback/access/jetty/RequestLogImpl.java   |   1 -
 .../ch/qos/logback/access/tomcat/LogbackValve.java |  14 +-
 .../logback/access/tomcat/LogbackValveTest.java    |  11 ++
 logback-classic/pom.xml                            |   2 +-
 .../src/test/input/issue/logback-1159.xml          |  60 ++++-----
 ...ml => depratedSizeAndTimeBasedFNATPWarning.xml} |   3 +-
 .../src/test/input/joran/rolling/timeAndSize.xml   |  11 +-
 .../rolling/timeAndSizeWithoutIntegerToken.xml     |   8 +-
 .../rolling/totalSizeCapSmallerThanMaxFileSize.xml |   4 -
 .../src/test/input/joran/sift/fileAppender.xml     |  26 ++++
 .../ch/qos/logback/classic/LoggerContextTest.java  |   3 +-
 .../pattern/ThrowableProxyConverterTest.java       |  11 +-
 .../TimeBasedRollingWithConfigFileTest.java        |  16 +++
 .../logback/classic/sift/SiftingAppenderTest.java  | 109 ++++++++++------
 logback-core/pom.xml                               |   2 +-
 .../main/java/ch/qos/logback/core/ContextBase.java |   3 +-
 .../java/ch/qos/logback/core/CoreConstants.java    |  10 +-
 .../java/ch/qos/logback/core/FileAppender.java     |  14 +-
 .../core/rolling/FixedWindowRollingPolicy.java     |   6 +-
 .../logback/core/rolling/RollingFileAppender.java  |  19 ++-
 .../core/rolling/SizeAndTimeBasedFNATP.java        |  22 +++-
 .../rolling/SizeAndTimeBasedRollingPolicy.java     |   3 +-
 .../core/rolling/helper/FileNamePattern.java       |  32 ++++-
 .../java/ch/qos/logback/core/util/ContextUtil.java |  22 ++++
 .../test/input/{compress2.txt => compress3.txt}    |   8 ++
 .../core/rolling/CollisionDetectionTest.java       | 141 +++++++++++++++++++++
 .../ch/qos/logback/core/rolling/PackageTest.java   |   3 +-
 .../core/rolling/helper/RollingCalendarTest.java   |  42 +++++-
 logback-examples/pom.xml                           |   2 +-
 logback-examples/setClasspath.cmd                  |   8 +-
 logback-examples/setClasspath.sh                   |   8 +-
 logback-site/pom.xml                               |   2 +-
 logback-site/src/site/pages/cla.txt                |  13 +-
 logback-site/src/site/pages/download.html          |  42 ++++--
 logback-site/src/site/pages/license.html           |   2 +-
 .../src/site/pages/manual/configuration.html       |   7 +-
 logback-site/src/site/pages/news.html              |  42 +++++-
 logback-site/src/site/pages/templates/footer.js    |   2 +-
 pom.xml                                            |   8 +-
 src/main/clas/signed-clas.txt                      |   1 +
 56 files changed, 693 insertions(+), 222 deletions(-)

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