Merge branch 'stable-2.11'

* stable-2.11:
  Disable gc_log file for in-memory acceptance tests
  Remove logs folder creation from GarbageCollectionLogFile

Change-Id: I99086cc2d1de52fd8e0fd0de1f9b828625d6090b
This commit is contained in:
David Pursehouse
2015-04-27 14:47:38 +09:00
3 changed files with 9 additions and 7 deletions

View File

@@ -38,10 +38,11 @@ import java.nio.file.Path;
@Singleton
public class SystemLog {
private static final org.slf4j.Logger log =
LoggerFactory.getLogger(SystemLog.class);
public static final String LOG4J_CONFIGURATION = "log4j.configuration";
private static final org.slf4j.Logger log = LoggerFactory
.getLogger(SystemLog.class);
private static final String LOG4J_CONFIGURATION = "log4j.configuration";
private final SitePaths site;
private final Config config;