cli: remove default username and password patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for CASSANDRA-5208
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c415eb80 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c415eb80 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c415eb80 Branch: refs/heads/trunk Commit: c415eb804672220c0eb82d14e1539c68c8f01a76 Parents: eed1b53 Author: Aleksey Yeschenko <[email protected]> Authored: Thu Jan 31 22:15:12 2013 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Thu Jan 31 22:15:12 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cli/CliOptions.java | 8 -------- 2 files changed, 1 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c415eb80/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 03218b9..4a67f9c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,6 +2,7 @@ * fix symlinks under data dir not working (CASSANDRA-5185) * fix bug in compact storage metadata handling (CASSANDRA-5189) * Validate login for USE queries (CASSANDRA-5207) + * cli: remove default username and password (CASSANDRA-5208) 1.2.1 * stream undelivered hints on decommission (CASSANDRA-5128) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c415eb80/src/java/org/apache/cassandra/cli/CliOptions.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cli/CliOptions.java b/src/java/org/apache/cassandra/cli/CliOptions.java index b684cc4..fc5eb03 100644 --- a/src/java/org/apache/cassandra/cli/CliOptions.java +++ b/src/java/org/apache/cassandra/cli/CliOptions.java @@ -136,19 +136,11 @@ public class CliOptions { css.username = cmd.getOptionValue(USERNAME_OPTION); } - else - { - css.username = "default"; - } if (cmd.hasOption(PASSWORD_OPTION)) { css.password = cmd.getOptionValue(PASSWORD_OPTION); } - else - { - css.password = ""; - } // Look for keyspace if (cmd.hasOption(KEYSPACE_OPTION))
