You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/03/21 19:08:10 UTC

[1/6] git commit: ACCUMULO-2489 Remove unneeded import

Repository: accumulo
Updated Branches:
  refs/heads/1.5.2-SNAPSHOT 1d608a81f -> 246104c28
  refs/heads/1.6.0-SNAPSHOT ff0693cc5 -> 3ce79a973
  refs/heads/master 0c37eeb9d -> 1429eca95


ACCUMULO-2489 Remove unneeded import


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/246104c2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/246104c2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/246104c2

Branch: refs/heads/1.5.2-SNAPSHOT
Commit: 246104c28b412e14e015fe8212c17f47bf3fcf21
Parents: 1d608a8
Author: Josh Elser <el...@apache.org>
Authored: Fri Mar 21 14:06:53 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Mar 21 14:06:53 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/server/conf/ServerConfiguration.java   | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/246104c2/server/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java b/server/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java
index 8653274..b2acd1a 100644
--- a/server/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java
+++ b/server/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java
@@ -27,7 +27,6 @@ import org.apache.accumulo.core.conf.ConfigSanityCheck;
 import org.apache.accumulo.core.conf.DefaultConfiguration;
 import org.apache.accumulo.core.conf.SiteConfiguration;
 import org.apache.accumulo.core.data.KeyExtent;
-import org.apache.accumulo.server.client.HdfsZooInstance;
 
 public class ServerConfiguration {

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Posted by el...@apache.org.
Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1429eca9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1429eca9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1429eca9

Branch: refs/heads/master
Commit: 1429eca959ac3df199eb838cb6e5dfd851b7d795
Parents: 0c37eeb 3ce79a9
Author: Josh Elser <el...@apache.org>
Authored: Fri Mar 21 14:07:22 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Mar 21 14:07:22 2014 -0400

----------------------------------------------------------------------

----------------------------------------------------------------------

[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Posted by el...@apache.org.
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3ce79a97
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3ce79a97
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3ce79a97

Branch: refs/heads/master
Commit: 3ce79a97308e1849b14471e3c1518ff88b9c00ce
Parents: ff0693c 246104c2
Author: Josh Elser <el...@apache.org>
Authored: Fri Mar 21 14:07:15 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Mar 21 14:07:15 2014 -0400

----------------------------------------------------------------------

----------------------------------------------------------------------

[3/6] git commit: ACCUMULO-2489 Remove unneeded import

Posted by el...@apache.org.
ACCUMULO-2489 Remove unneeded import


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/246104c2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/246104c2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/246104c2

Branch: refs/heads/master
Commit: 246104c28b412e14e015fe8212c17f47bf3fcf21
Parents: 1d608a8
Author: Josh Elser <el...@apache.org>
Authored: Fri Mar 21 14:06:53 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Mar 21 14:06:53 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/server/conf/ServerConfiguration.java   | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/246104c2/server/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java b/server/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java
index 8653274..b2acd1a 100644
--- a/server/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java
+++ b/server/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java
@@ -27,7 +27,6 @@ import org.apache.accumulo.core.conf.ConfigSanityCheck;
 import org.apache.accumulo.core.conf.DefaultConfiguration;
 import org.apache.accumulo.core.conf.SiteConfiguration;
 import org.apache.accumulo.core.data.KeyExtent;
-import org.apache.accumulo.server.client.HdfsZooInstance;
 
 public class ServerConfiguration {

[5/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Posted by el...@apache.org.
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3ce79a97
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3ce79a97
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3ce79a97

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 3ce79a97308e1849b14471e3c1518ff88b9c00ce
Parents: ff0693c 246104c2
Author: Josh Elser <el...@apache.org>
Authored: Fri Mar 21 14:07:15 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Mar 21 14:07:15 2014 -0400

----------------------------------------------------------------------

----------------------------------------------------------------------

[2/6] git commit: ACCUMULO-2489 Remove unneeded import

Posted by el...@apache.org.
ACCUMULO-2489 Remove unneeded import


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/246104c2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/246104c2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/246104c2

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 246104c28b412e14e015fe8212c17f47bf3fcf21
Parents: 1d608a8
Author: Josh Elser <el...@apache.org>
Authored: Fri Mar 21 14:06:53 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Mar 21 14:06:53 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/server/conf/ServerConfiguration.java   | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/246104c2/server/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java b/server/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java
index 8653274..b2acd1a 100644
--- a/server/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java
+++ b/server/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java
@@ -27,7 +27,6 @@ import org.apache.accumulo.core.conf.ConfigSanityCheck;
 import org.apache.accumulo.core.conf.DefaultConfiguration;
 import org.apache.accumulo.core.conf.SiteConfiguration;
 import org.apache.accumulo.core.data.KeyExtent;
-import org.apache.accumulo.server.client.HdfsZooInstance;
 
 public class ServerConfiguration {