Repository: accumulo Updated Branches: refs/heads/1.8 09ee7b089 -> dddd22558
ACCUMULO-4504: Improved the help for Shell zookeeper options Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/32fd1004 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/32fd1004 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/32fd1004 Branch: refs/heads/1.8 Commit: 32fd1004a413607327bf6b2f16e88eeffa471955 Parents: 95f4285 Author: Mike Miller <mmil...@apache.org> Authored: Mon Nov 7 11:25:26 2016 -0500 Committer: Mike Miller <mmil...@apache.org> Committed: Mon Nov 7 11:25:26 2016 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/shell/ShellOptionsJC.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/32fd1004/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java b/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java index d8ac3bc..20063b8 100644 --- a/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java +++ b/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java @@ -168,7 +168,8 @@ public class ShellOptionsJC { @Parameter(names = {"-h", "--hdfsZooInstance"}, description = "use hdfs zoo instance") private boolean hdfsZooInstance; - @Parameter(names = {"-z", "--zooKeeperInstance"}, description = "use a zookeeper instance with the given instance name and list of zoo hosts", arity = 2) + @Parameter(names = {"-z", "--zooKeeperInstance"}, description = "use a zookeeper instance with the given instance name and list of zoo hosts. " + + "Syntax: -z <zoo-instance-name> <zoo-hosts>. Where <zoo-hosts> is a comma separated list of zookeeper servers.", arity = 2) private List<String> zooKeeperInstance = new ArrayList<>(); @Parameter(names = {"--ssl"}, description = "use ssl to connect to accumulo") @@ -182,10 +183,12 @@ public class ShellOptionsJC { + "which defaults to ~/.accumulo/config:$ACCUMULO_CONF_DIR/client.conf:/etc/accumulo/client.conf") private String clientConfigFile = null; - @Parameter(names = {"-zi", "--zooKeeperInstanceName"}, description = "use a zookeeper instance with the given instance name") + @Parameter(names = {"-zi", "--zooKeeperInstanceName"}, description = "use a zookeeper instance with the given instance name. " + + "This parameter is used in conjunction with -zh.") private String zooKeeperInstanceName; - @Parameter(names = {"-zh", "--zooKeeperHosts"}, description = "use a zookeeper instance with the given list of zoo hosts") + @Parameter(names = {"-zh", "--zooKeeperHosts"}, description = "use a zookeeper instance with the given comma separated list of zookeeper servers. " + + "This parameter is used in conjunction with -zi.") private String zooKeeperHosts; @Parameter(names = "--auth-timeout", description = "minutes the shell can be idle without re-entering a password")
