You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2013/07/17 04:33:52 UTC
[50/50] [abbrv] git commit: ACCUMULO-1496 Fix warnings introduced by
merge
ACCUMULO-1496 Fix warnings introduced by merge
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f5324a22
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f5324a22
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f5324a22
Branch: refs/heads/ACCUMULO-1496
Commit: f5324a22725a8aac2bb8883264caa1705db955c5
Parents: 964e761
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Jul 16 16:07:11 2013 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue Jul 16 16:07:11 2013 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/server/monitor/Monitor.java | 1 -
server/src/main/java/org/apache/accumulo/server/util/Admin.java | 1 -
.../main/java/org/apache/accumulo/server/util/ZooKeeperMain.java | 2 --
3 files changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f5324a22/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java b/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
index 6bca1a3..faf6e04 100644
--- a/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
+++ b/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
@@ -74,7 +74,6 @@ import org.apache.accumulo.server.security.SecurityConstants;
import org.apache.accumulo.server.util.EmbeddedWebServer;
import org.apache.accumulo.start.annotations.AccumuloService;
import org.apache.accumulo.trace.instrument.Tracer;
-import org.apache.hadoop.fs.FileSystem;
import org.apache.log4j.Logger;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f5324a22/server/src/main/java/org/apache/accumulo/server/util/Admin.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/util/Admin.java b/server/src/main/java/org/apache/accumulo/server/util/Admin.java
index 88dca6f..9813ba0 100644
--- a/server/src/main/java/org/apache/accumulo/server/util/Admin.java
+++ b/server/src/main/java/org/apache/accumulo/server/util/Admin.java
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.Connector;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f5324a22/server/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java b/server/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java
index 730f421..80fbe5b 100644
--- a/server/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java
+++ b/server/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java
@@ -16,13 +16,11 @@
*/
package org.apache.accumulo.server.util;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.cli.Help;
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.server.ServerConstants;
import org.apache.accumulo.server.client.HdfsZooInstance;
-import org.apache.accumulo.server.conf.ServerConfiguration;
import org.apache.accumulo.start.annotations.AccumuloService;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;