Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fc1677ed Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fc1677ed Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fc1677ed Branch: refs/heads/master Commit: fc1677ed07226b87b1048350d8ecdb9131f4a17f Parents: 4b9957b 5da9a3a Author: Mike Miller <[email protected]> Authored: Wed Aug 2 12:23:52 2017 -0400 Committer: Mike Miller <[email protected]> Committed: Wed Aug 2 12:23:52 2017 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/core/util/Version.java | 75 -------------------- .../apache/accumulo/core/util/TestVersion.java | 65 ----------------- .../org/apache/accumulo/server/Accumulo.java | 4 +- 3 files changed, 1 insertion(+), 143 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/fc1677ed/core/src/main/java/org/apache/accumulo/core/util/Version.java ---------------------------------------------------------------------- diff --cc core/src/main/java/org/apache/accumulo/core/util/Version.java index 5dd9831,c5d23fe..e51a9d5 --- a/core/src/main/java/org/apache/accumulo/core/util/Version.java +++ b/core/src/main/java/org/apache/accumulo/core/util/Version.java @@@ -16,22 -16,14 +16,17 @@@ */ package org.apache.accumulo.core.util; - import java.util.regex.Matcher; - import java.util.regex.Pattern; - import org.apache.accumulo.start.Main; import org.apache.accumulo.start.spi.KeywordExecutable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.auto.service.AutoService; @AutoService(KeywordExecutable.class) public class Version implements KeywordExecutable { + private static final Logger log = LoggerFactory.getLogger(Version.class); - public Version() {} - @Override public String keyword() { return "version"; http://git-wip-us.apache.org/repos/asf/accumulo/blob/fc1677ed/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java ----------------------------------------------------------------------
