You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/02/03 19:04:30 UTC
[1/3] accumulo git commit: ACCUMULO-3553 Better parameter
descriptions for CleanZookeeper.
Repository: accumulo
Updated Branches:
refs/heads/1.6 4999b5a23 -> 5b48c5ad6
refs/heads/master c479f874a -> a2d272c6f
ACCUMULO-3553 Better parameter descriptions for CleanZookeeper.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5b48c5ad
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5b48c5ad
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5b48c5ad
Branch: refs/heads/1.6
Commit: 5b48c5ad6a7cb5ee0b7d6daebd457572dca1ce5a
Parents: 4999b5a
Author: Josh Elser <el...@apache.org>
Authored: Tue Feb 3 11:12:30 2015 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Tue Feb 3 11:12:30 2015 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/server/util/CleanZookeeper.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5b48c5ad/server/base/src/main/java/org/apache/accumulo/server/util/CleanZookeeper.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/CleanZookeeper.java b/server/base/src/main/java/org/apache/accumulo/server/util/CleanZookeeper.java
index e993d87..46a82ab 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/CleanZookeeper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/CleanZookeeper.java
@@ -36,9 +36,9 @@ public class CleanZookeeper {
private static final Logger log = Logger.getLogger(CleanZookeeper.class);
static class Opts extends Help {
- @Parameter(names = {"-z", "--keepers"}, description = "comma separated list of zookeeper hosts")
+ @Parameter(names = {"-z", "--keepers"}, description = "Comma-separated list of zookeeper hosts, if different than instance.zookeeper.host in accumulo-site.xml")
String keepers = "localhost:2181";
- @Parameter(names = {"--password"}, description = "the system secret", password = true)
+ @Parameter(names = {"--password"}, description = "The system secret, if different than instance.secret in accumulo-site.xml", password = true)
String auth;
}
[3/3] accumulo git commit: Merge branch '1.6'
Posted by el...@apache.org.
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/a2d272c6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a2d272c6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a2d272c6
Branch: refs/heads/master
Commit: a2d272c6f94504a7c2f1701592e07dc01e93f006
Parents: c479f87 5b48c5a
Author: Josh Elser <el...@apache.org>
Authored: Tue Feb 3 11:12:58 2015 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Tue Feb 3 11:12:58 2015 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/server/util/CleanZookeeper.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a2d272c6/server/base/src/main/java/org/apache/accumulo/server/util/CleanZookeeper.java
----------------------------------------------------------------------
[2/3] accumulo git commit: ACCUMULO-3553 Better parameter
descriptions for CleanZookeeper.
Posted by el...@apache.org.
ACCUMULO-3553 Better parameter descriptions for CleanZookeeper.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5b48c5ad
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5b48c5ad
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5b48c5ad
Branch: refs/heads/master
Commit: 5b48c5ad6a7cb5ee0b7d6daebd457572dca1ce5a
Parents: 4999b5a
Author: Josh Elser <el...@apache.org>
Authored: Tue Feb 3 11:12:30 2015 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Tue Feb 3 11:12:30 2015 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/server/util/CleanZookeeper.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5b48c5ad/server/base/src/main/java/org/apache/accumulo/server/util/CleanZookeeper.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/CleanZookeeper.java b/server/base/src/main/java/org/apache/accumulo/server/util/CleanZookeeper.java
index e993d87..46a82ab 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/CleanZookeeper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/CleanZookeeper.java
@@ -36,9 +36,9 @@ public class CleanZookeeper {
private static final Logger log = Logger.getLogger(CleanZookeeper.class);
static class Opts extends Help {
- @Parameter(names = {"-z", "--keepers"}, description = "comma separated list of zookeeper hosts")
+ @Parameter(names = {"-z", "--keepers"}, description = "Comma-separated list of zookeeper hosts, if different than instance.zookeeper.host in accumulo-site.xml")
String keepers = "localhost:2181";
- @Parameter(names = {"--password"}, description = "the system secret", password = true)
+ @Parameter(names = {"--password"}, description = "The system secret, if different than instance.secret in accumulo-site.xml", password = true)
String auth;
}