Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3899eb0f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3899eb0f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3899eb0f Branch: refs/heads/master Commit: 3899eb0f33578b59b52dce5721994f3242605fea Parents: c2f5946 794e68c Author: Josh Elser <els...@apache.org> Authored: Sun Dec 28 21:26:35 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Sun Dec 28 21:26:35 2014 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/server/Accumulo.java | 7 ------- .../apache/accumulo/server/watcher/Log4jConfiguration.java | 8 ++++++++ 2 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3899eb0f/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java ---------------------------------------------------------------------- diff --cc server/base/src/main/java/org/apache/accumulo/server/Accumulo.java index 1785acb,46ec64f..c424f1a --- a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java +++ b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java @@@ -155,15 -163,9 +154,9 @@@ public class Accumulo // Set up local file-based logging right away Log4jConfiguration logConf = new Log4jConfiguration(logConfigFile); logConf.resetLogger(); - - // Watch the auditLog.xml for the future updates - DOMConfigurator.configureAndWatch(auditConfig, 5000); } - public static void init(VolumeManager fs, ServerConfiguration serverConfig, String application) throws IOException { + public static void init(VolumeManager fs, ServerConfigurationFactory serverConfig, String application) throws IOException { final AccumuloConfiguration conf = serverConfig.getConfiguration(); final Instance instance = serverConfig.getInstance();
