Updated Branches: refs/heads/1.5.1-SNAPSHOT 710c6234b -> 9aebb2b11
ACCUMULO-1544 - removing username flag and use from init/MAC Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9aebb2b1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9aebb2b1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9aebb2b1 Branch: refs/heads/1.5.1-SNAPSHOT Commit: 9aebb2b110abe773523dc43a46b1804fc5d37797 Parents: 710c623 Author: John Vines <[email protected]> Authored: Wed Sep 4 14:27:45 2013 -0400 Committer: John Vines <[email protected]> Committed: Wed Sep 4 14:27:45 2013 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java | 2 +- .../src/main/java/org/apache/accumulo/server/util/Initialize.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9aebb2b1/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java ---------------------------------------------------------------------- diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java index eb0e180..35d395a 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java @@ -298,7 +298,7 @@ public class MiniAccumuloCluster { // sleep a little bit to let zookeeper come up before calling init, seems to work better UtilWaitThread.sleep(250); - Process initProcess = exec(Initialize.class, "--instance-name", INSTANCE_NAME, "--password", config.getRootPassword(), "--username", "root"); + Process initProcess = exec(Initialize.class, "--instance-name", INSTANCE_NAME, "--password", config.getRootPassword()); int ret = initProcess.waitFor(); if (ret != 0) { throw new RuntimeException("Initialize process returned " + ret); http://git-wip-us.apache.org/repos/asf/accumulo/blob/9aebb2b1/server/src/main/java/org/apache/accumulo/server/util/Initialize.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/util/Initialize.java b/server/src/main/java/org/apache/accumulo/server/util/Initialize.java index 7e4ed88..441b599 100644 --- a/server/src/main/java/org/apache/accumulo/server/util/Initialize.java +++ b/server/src/main/java/org/apache/accumulo/server/util/Initialize.java @@ -468,8 +468,6 @@ public class Initialize { String cliInstanceName; @Parameter(names = "--password", description = "set the password on the command line") String cliPassword; - @Parameter(names = "--username", description = "set the root username on the command line") - String cliUser; byte[] rootpass = null; }
