Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
bin/cqlsh
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/35b7da4d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/35b7da4d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/35b7da4d
Branch: refs/heads/trunk
Commit: 35b7da4d0d2a3bd538f6c3394d5a60d553bda458
Parents: 25af168 37b9410
Author: Mikhail Stepura <[email protected]>
Authored: Fri Mar 21 11:45:19 2014 -0700
Committer: Mikhail Stepura <[email protected]>
Committed: Fri Mar 21 11:45:19 2014 -0700
----------------------------------------------------------------------
bin/cqlsh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/35b7da4d/bin/cqlsh
----------------------------------------------------------------------
diff --cc bin/cqlsh
index f704f0e,6fa3afe..aa19c4d
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@@ -464,9 -467,13 +465,11 @@@ class Shell(cmd.Cmd)
cmd.Cmd.__init__(self, completekey=completekey)
self.hostname = hostname
self.port = port
- self.transport_factory = transport_factory
-
- if username and not password:
- password = getpass.getpass()
-
- self.username = username
- self.password = password
+ self.auth_provider = None
- if username and password:
++ if username:
++ if not password:
++ password = getpass.getpass()
+ self.auth_provider = lambda host: dict(username=username,
password=password)
self.keyspace = keyspace
self.tracing_enabled = tracing_enabled
self.expand_enabled = expand_enabled
