You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mi...@apache.org on 2014/03/21 19:46:38 UTC
[1/6] git commit: Make cqlsh prompt for a password if the user
doesn't enter one.
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 6b6139cc8 -> 37b941067
refs/heads/cassandra-2.1 25af168c0 -> 35b7da4d0
refs/heads/trunk a161f088c -> 2e48e0c43
Make cqlsh prompt for a password if the user doesn't enter one.
patch by J.B. Langston; reviewed by Mikhail Stepura for CASSANDRA-6902
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/37b94106
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37b94106
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37b94106
Branch: refs/heads/cassandra-2.0
Commit: 37b9410675b93843bc8223e57621a10dd841c291
Parents: 6b6139c
Author: J.B. Langston <jb...@datastax.com>
Authored: Fri Mar 21 11:42:06 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Fri Mar 21 11:42:06 2014 -0700
----------------------------------------------------------------------
bin/cqlsh | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/37b94106/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 4669cda..6fa3afe 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -51,6 +51,7 @@ import locale
import platform
import warnings
import csv
+import getpass
readline = None
@@ -467,6 +468,10 @@ class Shell(cmd.Cmd):
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.keyspace = keyspace
[5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by mi...@apache.org.
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/cassandra-2.1
Commit: 35b7da4d0d2a3bd538f6c3394d5a60d553bda458
Parents: 25af168 37b9410
Author: Mikhail Stepura <mi...@apache.org>
Authored: Fri Mar 21 11:45:19 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
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
[4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by mi...@apache.org.
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 <mi...@apache.org>
Authored: Fri Mar 21 11:45:19 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
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
[3/6] git commit: Make cqlsh prompt for a password if the user
doesn't enter one.
Posted by mi...@apache.org.
Make cqlsh prompt for a password if the user doesn't enter one.
patch by J.B. Langston; reviewed by Mikhail Stepura for CASSANDRA-6902
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/37b94106
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37b94106
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37b94106
Branch: refs/heads/trunk
Commit: 37b9410675b93843bc8223e57621a10dd841c291
Parents: 6b6139c
Author: J.B. Langston <jb...@datastax.com>
Authored: Fri Mar 21 11:42:06 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Fri Mar 21 11:42:06 2014 -0700
----------------------------------------------------------------------
bin/cqlsh | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/37b94106/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 4669cda..6fa3afe 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -51,6 +51,7 @@ import locale
import platform
import warnings
import csv
+import getpass
readline = None
@@ -467,6 +468,10 @@ class Shell(cmd.Cmd):
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.keyspace = keyspace
[2/6] git commit: Make cqlsh prompt for a password if the user
doesn't enter one.
Posted by mi...@apache.org.
Make cqlsh prompt for a password if the user doesn't enter one.
patch by J.B. Langston; reviewed by Mikhail Stepura for CASSANDRA-6902
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/37b94106
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37b94106
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37b94106
Branch: refs/heads/cassandra-2.1
Commit: 37b9410675b93843bc8223e57621a10dd841c291
Parents: 6b6139c
Author: J.B. Langston <jb...@datastax.com>
Authored: Fri Mar 21 11:42:06 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Fri Mar 21 11:42:06 2014 -0700
----------------------------------------------------------------------
bin/cqlsh | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/37b94106/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 4669cda..6fa3afe 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -51,6 +51,7 @@ import locale
import platform
import warnings
import csv
+import getpass
readline = None
@@ -467,6 +468,10 @@ class Shell(cmd.Cmd):
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.keyspace = keyspace
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by mi...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2e48e0c4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e48e0c4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e48e0c4
Branch: refs/heads/trunk
Commit: 2e48e0c43a3eb2c733a498a5bde49ec5d2953578
Parents: a161f08 35b7da4
Author: Mikhail Stepura <mi...@apache.org>
Authored: Fri Mar 21 11:45:42 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Fri Mar 21 11:45:42 2014 -0700
----------------------------------------------------------------------
bin/cqlsh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------