You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2013/09/04 20:37:34 UTC
[1/2] git commit: ACCUMULO-1544 - removing username flag and use from
init/MAC
Updated Branches:
refs/heads/master e7855b847 -> 808a5e01e
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/master
Commit: 9aebb2b110abe773523dc43a46b1804fc5d37797
Parents: 710c623
Author: John Vines <jv...@gmail.com>
Authored: Wed Sep 4 14:27:45 2013 -0400
Committer: John Vines <jv...@gmail.com>
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;
}
[2/2] git commit: Merging ACCUMULO-1544 forward (even though no
changes needed to be propogated)
Posted by vi...@apache.org.
Merging ACCUMULO-1544 forward (even though no changes needed to be propogated)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/808a5e01
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/808a5e01
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/808a5e01
Branch: refs/heads/master
Commit: 808a5e01e0091cc52685411aa497b282b45fb38d
Parents: e7855b8 9aebb2b
Author: John Vines <jv...@gmail.com>
Authored: Wed Sep 4 14:35:27 2013 -0400
Committer: John Vines <jv...@gmail.com>
Committed: Wed Sep 4 14:36:34 2013 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/server/util/Initialize.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/808a5e01/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
----------------------------------------------------------------------