accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [6/6] git commit: Merge branch '1.6'
Date Sat, 25 Oct 2014 02:27:18 GMT
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/59333e3c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/59333e3c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/59333e3c

Branch: refs/heads/master
Commit: 59333e3cb3cbf01dcb53286958b70d57cec0d544
Parents: 9a15f7b 5cb976b
Author: Josh Elser <elserj@apache.org>
Authored: Fri Oct 24 22:12:25 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Fri Oct 24 22:12:25 2014 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/tserver/TabletServer.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/59333e3c/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 26c1759,03fe069..29ed8d7
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@@ -2864,16 -3660,16 +2864,16 @@@ public class TabletServer implements Ru
  
    public static void main(String[] args) throws IOException {
      try {
 -      SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
 +      SecurityUtil.serverLogin(SiteConfiguration.getInstance());
        ServerOpts opts = new ServerOpts();
-       opts.parseArgs("tserver", args);
-       String hostname = opts.getAddress();
        final String app = "tserver";
+       opts.parseArgs(app, args);
+       String hostname = opts.getAddress();
        Accumulo.setupLogging(app);
        final Instance instance = HdfsZooInstance.getInstance();
 -      ServerConfiguration conf = new ServerConfiguration(instance);
 +      ServerConfigurationFactory conf = new ServerConfigurationFactory(instance);
        VolumeManager fs = VolumeManagerImpl.get();
-       Accumulo.init(fs, conf, "tserver");
+       Accumulo.init(fs, conf, app);
        TabletServer server = new TabletServer(conf, fs);
        server.config(hostname);
        Accumulo.enableTracing(hostname, app);


Mime
View raw message