This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 5474e7d4bb0c89b1bac92ce531901d92351d657d (commit) from 663030a72343a85e43599339f5a00cb9ccde45c4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=5474e7d4bb0c89b1bac92ce53... http://github.com/ceki/logback/commit/5474e7d4bb0c89b1bac92ce531901d92351d65... commit 5474e7d4bb0c89b1bac92ce531901d92351d657d Author: Ceki Gulcu <ceki@qos.ch> Date: Mon Jul 18 23:47:40 2011 +0200 minor clean up diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java index 6004966..d1df796 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java @@ -44,7 +44,6 @@ import ch.qos.logback.core.status.InfoStatus; import ch.qos.logback.core.status.StatusChecker; import ch.qos.logback.core.testUtil.Env; import ch.qos.logback.core.util.StatusPrinter; -import sun.org.mozilla.javascript.internal.Context; public class ReconfigureOnChangeTest { final static int THREAD_COUNT = 5; diff --git a/logback-core/pom.xml b/logback-core/pom.xml index 2e4abda..a402b35 100644 --- a/logback-core/pom.xml +++ b/logback-core/pom.xml @@ -112,7 +112,7 @@ <plugin> <groupId>org.scala-tools</groupId> <artifactId>maven-scala-plugin</artifactId> - <version>2.14.3</version> + <!--<version>2.14.3</version>--> <configuration> <testSourceDir>src/test/scala</testSourceDir> </configuration> diff --git a/logback-core/src/test/scala/ch/qos/logback/core/rolling/RollingScaffolding.scala b/logback-core/src/test/scala/ch/qos/logback/core/rolling/RollingScaffolding.scala index 5d4f71a..1d2d77a 100644 --- a/logback-core/src/test/scala/ch/qos/logback/core/rolling/RollingScaffolding.scala +++ b/logback-core/src/test/scala/ch/qos/logback/core/rolling/RollingScaffolding.scala @@ -102,7 +102,7 @@ trait RollingScaffolding { private[rolling] def waitForCompression(tbrp: TimeBasedRollingPolicy[AnyRef]): Unit = { if (tbrp.future != null && !tbrp.future.isDone) { - tbrp.future.get(200, TimeUnit.MILLISECONDS) + tbrp.future.get(400, TimeUnit.MILLISECONDS) } } diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index da477fd..4a74a81 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -52,6 +52,12 @@ reported by Joern Huxhorn. </p> + <p>Single quotes within a date conversion specifier in filename + patterns are now handled correctly. This fixes <a + href="http://jira.qos.ch/browse/LBCORE-214">LBCORE-214</a> + reported by Derek Libby. + </p> + <hr width="80%" align="center" /> <h3>June 9th, 2011 - Release of version 0.9.29</h3> ----------------------------------------------------------------------- Summary of changes: .../classic/turbo/ReconfigureOnChangeTest.java | 1 - logback-core/pom.xml | 2 +- .../logback/core/rolling/RollingScaffolding.scala | 2 +- logback-site/src/site/pages/news.html | 6 ++++++ 4 files changed, 8 insertions(+), 3 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.