This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository logback.
commit 4f377ee1fcd198febb8bdbee828dfa766726075d Merge: 43668b5 6fdef70 Author: Emmanuel Bourg <[email protected]> Date: Fri Feb 12 23:46:34 2016 +0100 Merge tag 'upstream/1.1.4' Upstream version 1.1.4 docs/access.html | 4 +- docs/dependencies.html | 13 +- docs/documentation.html | 4 +- docs/download.html | 4 +- docs/faq.html | 6 +- docs/js/dsl.js | 2 +- docs/manual/appenders.html | 41 +- docs/manual/appenders_ja.html | 2871 ++++++++++++++++++++ docs/manual/architecture.html | 2 + docs/manual/architecture_ja.html | 619 +++++ docs/manual/configuration.html | 68 +- docs/manual/configuration_ja.html | 1273 +++++++++ docs/manual/encoders.html | 2 + docs/manual/encoders_ja.html | 175 ++ docs/manual/filters.html | 2 + docs/manual/filters_ja.html | 818 ++++++ docs/manual/groovy.html | 5 +- docs/manual/groovy_ja.html | 364 +++ docs/manual/index.html | 1 + docs/manual/index_ja.html | 115 + docs/manual/introduction.html | 5 +- docs/manual/introduction_ja.html | 165 ++ docs/manual/jmxConfig.html | 2 + docs/manual/jmxConfig_ja.html | 290 ++ docs/manual/layouts.html | 2 + docs/manual/layouts_ja.html | 1645 +++++++++++ docs/manual/loggingSeparation.html | 8 +- docs/manual/loggingSeparation_ja.html | 270 ++ docs/manual/mdc.html | 2 + docs/manual/mdc_ja.html | 542 ++++ docs/manual/menu_ja.js | 16 + docs/manual/migrationFromLog4j.html | 2 + docs/manual/migrationFromLog4j_ja.html | 157 ++ docs/manual/onJoran.html | 4 +- docs/manual/onJoran_ja.html | 433 +++ docs/manual/receivers.html | 2 + docs/manual/receivers_ja.html | 343 +++ docs/manual/usingSSL.html | 26 +- docs/manual/usingSSL_ja.html | 811 ++++++ docs/news.html | 64 +- docs/project-reports.html | 10 +- docs/setup.html | 16 +- docs/templates/footer.js | 2 +- logback-access/pom.xml | 2 +- .../access/pattern/EnsureLineSeparation.java | 3 +- .../ch/qos/logback/access/tomcat/LogbackValve.java | 18 +- .../qos/logback/access/jetty/JettyBasicTest.java | 30 +- .../access/servlet/TeeHttpServletResponseTest.java | 2 +- .../access/testUtil/NotifyingListAppender.java | 8 +- logback-classic/osgi-build.xml | 2 +- logback-classic/pom.xml | 8 +- logback-classic/src/IBUNDLE-META-INF/MANIFEST.MF | 9 +- .../main/java/ch/qos/logback/classic/Logger.java | 30 +- .../java/ch/qos/logback/classic/LoggerContext.java | 5 +- .../logback/classic/joran/JoranConfigurator.java | 5 +- .../classic/joran/action/ConfigurationAction.java | 10 +- .../classic/pattern/EnsureExceptionHandling.java | 16 +- .../classic/pattern/ThrowableProxyConverter.java | 4 +- .../ch/qos/logback/classic/spi/LoggingEvent.java | 9 +- .../logback/classic/util/LogbackMDCAdapter.java | 22 +- .../src/test/input/joran/packagingDataDisabled.xml | 16 + .../src/test/input/joran/packagingDataEnabled.xml | 16 + .../sift/{lbclassic203.xml => logback_416.xml} | 2 +- .../recursiveInit.xml => input/listAppender.xml} | 6 +- logback-classic/src/test/java/Main.java | 12 - .../ch/qos/logback/classic/issue/PackageTest.java | 3 +- .../lbclassic139/LB139_DeadlockTest.java | 2 +- .../lbclassic135/lbclassic139/PackageTest.java | 23 - .../ConcurrentSiftingTest.java | 8 +- .../InstanceCountingAppender.java | 8 +- .../{lbclassic203 => logback416}/PackageTest.java | 2 +- .../logback/classic/joran/EvaluatorJoranTest.java | 5 +- .../classic/joran/JoranConfiguratorTest.java | 127 +- .../qos/logback/classic/log4j/XMLLayoutTest.java | 6 +- .../ExtendedThrowableProxyConverterTest.java | 9 +- .../RootCauseFirstThrowableProxyConverterTest.java | 1 + .../classic/sift/MDCBasedDiscriminatorTest.java | 1 + .../logback/classic/sift/SiftingAppenderTest.java | 36 +- .../classic/util/LogbackMDCAdapterTest.java | 28 +- .../impl/MultithreadedInitializationTest.java | 108 + .../slf4j/impl/RecursiveInitializationTest.java | 10 +- .../src/test/resources/recursiveInit.xml | 2 +- logback-core/pom.xml | 7 +- .../ch/qos/logback/core/AsyncAppenderBase.java | 3 + .../logback/core/pattern/PatternLayoutBase.java | 2 +- .../logback/core/pattern/PostCompileProcessor.java | 4 +- .../ch/qos/logback/core/rolling/RollingPolicy.java | 2 +- .../logback/core/rolling/RollingPolicyBase.java | 4 +- ...TimeBasedFileNamingAndTriggeringPolicyBase.java | 9 +- .../core/rolling/TimeBasedRollingPolicy.java | 13 +- .../core/rolling/helper/DefaultArchiveRemover.java | 2 +- .../core/rolling/helper/FileNamePattern.java | 8 +- .../core/rolling/helper/IntegerTokenConverter.java | 2 +- .../logback/core/util/CachingDateFormatter.java | 2 +- .../ch/qos/logback/core/AsyncAppenderBaseTest.java | 428 +-- ...BasedFileNamingAndTriggeringPolicyBaseTest.java | 40 +- .../logback/core/rolling/TimeBasedRollingTest.java | 14 +- .../core/rolling/helper/FileNamePatternTest.java | 47 +- .../logback/core/util/CachingFotmatterTest.java | 40 + .../logback/core/util/DatePatternToRegexTest.java | 8 +- logback-examples/pom.xml | 19 +- logback-examples/setClasspath.cmd | 8 +- logback-examples/setClasspath.sh | 8 +- logback-site/pom.xml | 2 +- logback-site/src/site/pages/dependencies.html | 13 +- logback-site/src/site/pages/documentation.html | 4 +- logback-site/src/site/pages/js/dsl.js | 2 +- logback-site/src/site/pages/manual/appenders.html | 37 +- .../src/site/pages/manual/appenders_ja.html | 2871 ++++++++++++++++++++ .../src/site/pages/manual/architecture.html | 2 + .../src/site/pages/manual/architecture_ja.html | 619 +++++ .../src/site/pages/manual/configuration.html | 68 +- .../src/site/pages/manual/configuration_ja.html | 1273 +++++++++ logback-site/src/site/pages/manual/encoders.html | 2 + .../src/site/pages/manual/encoders_ja.html | 175 ++ logback-site/src/site/pages/manual/filters.html | 2 + logback-site/src/site/pages/manual/filters_ja.html | 818 ++++++ logback-site/src/site/pages/manual/groovy.html | 5 +- logback-site/src/site/pages/manual/groovy_ja.html | 364 +++ logback-site/src/site/pages/manual/index.html | 1 + logback-site/src/site/pages/manual/index_ja.html | 115 + .../src/site/pages/manual/introduction.html | 3 + .../src/site/pages/manual/introduction_ja.html | 165 ++ logback-site/src/site/pages/manual/jmxConfig.html | 2 + .../src/site/pages/manual/jmxConfig_ja.html | 290 ++ logback-site/src/site/pages/manual/layouts.html | 2 + logback-site/src/site/pages/manual/layouts_ja.html | 1645 +++++++++++ .../src/site/pages/manual/loggingSeparation.html | 2 + .../site/pages/manual/loggingSeparation_ja.html | 270 ++ logback-site/src/site/pages/manual/mdc.html | 2 + logback-site/src/site/pages/manual/mdc_ja.html | 542 ++++ logback-site/src/site/pages/manual/menu_ja.js | 16 + .../src/site/pages/manual/migrationFromLog4j.html | 2 + .../site/pages/manual/migrationFromLog4j_ja.html | 157 ++ logback-site/src/site/pages/manual/onJoran.html | 2 + logback-site/src/site/pages/manual/onJoran_ja.html | 433 +++ logback-site/src/site/pages/manual/receivers.html | 2 + .../src/site/pages/manual/receivers_ja.html | 343 +++ logback-site/src/site/pages/manual/usingSSL.html | 26 +- .../src/site/pages/manual/usingSSL_ja.html | 811 ++++++ logback-site/src/site/pages/news.html | 64 +- logback-site/src/site/pages/setup.html | 2 +- logback-site/src/site/pages/templates/footer.js | 2 +- pom.xml | 66 +- src/main/clas/signed-clas.txt | 7 + 145 files changed, 23128 insertions(+), 591 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/logback.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
