You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mm...@apache.org on 2017/08/02 16:40:26 UTC
[2/3] accumulo git commit: Merge branch '1.7' into 1.8
Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5da9a3af
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5da9a3af
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5da9a3af
Branch: refs/heads/master
Commit: 5da9a3afaa324b4e2cfbcfbf6132854c586ef1bd
Parents: 591ba9f f2b9e24
Author: Mike Miller <mm...@apache.org>
Authored: Wed Aug 2 12:15:59 2017 -0400
Committer: Mike Miller <mm...@apache.org>
Committed: Wed Aug 2 12:15:59 2017 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/util/Version.java | 73 --------------------
.../apache/accumulo/core/util/TestVersion.java | 64 -----------------
.../org/apache/accumulo/server/Accumulo.java | 4 +-
3 files changed, 1 insertion(+), 140 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5da9a3af/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 43b9209,e4c944f..362cd0e
--- a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
@@@ -36,7 -34,7 +36,6 @@@ import org.apache.accumulo.core.client.
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.util.AddressUtil;
- import org.apache.accumulo.core.util.Version;
-import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.core.volume.Volume;
import org.apache.accumulo.core.zookeeper.ZooUtil;
import org.apache.accumulo.fate.ReadOnlyStore;