You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2014/07/17 21:45:50 UTC
[1/3] git commit: Fix cqlsh authentication with 2.1 python driver
Repository: cassandra
Updated Branches:
refs/heads/trunk 41a91e9a1 -> 1a58ecc26
Fix cqlsh authentication with 2.1 python driver
Patch by Mike Adamson; reviewed by Tyler Hobbs for CASSANDRA-7564
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e4b40c75
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4b40c75
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e4b40c75
Branch: refs/heads/trunk
Commit: e4b40c75c050914a5f2bdc88271e1ab518f8aaac
Parents: 2a66119
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Thu Jul 17 14:43:47 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Thu Jul 17 14:43:47 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4b40c75/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8864cb1..81a35cd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@
* Fix configuration error message when running nodetool ring (CASSANDRA-7508)
* Support conditional updates, tuple type, and the v3 protocol in cqlsh (CASSANDRA-7509)
* Handle queries on multiple secondary index types (CASSANDRA-7525)
+ * Fix cqlsh authentication with v3 native protocol (CASSANDRA-7564)
Merged from 2.0:
* (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
* Fix range merging when DES scores are zero (CASSANDRA-7535)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4b40c75/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 76ff590..1798d3f 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -110,6 +110,7 @@ from cassandra.cluster import Cluster
from cassandra.query import SimpleStatement
from cassandra.policies import WhiteListRoundRobinPolicy
from cassandra.metadata import protect_name, protect_names, protect_value
+from cassandra.auth import PlainTextAuthProvider
# cqlsh should run correctly when run out of a Cassandra source tree,
# out of an unpacked Cassandra tarball, and after a proper package install.
@@ -499,7 +500,7 @@ class Shell(cmd.Cmd):
if username:
if not password:
password = getpass.getpass()
- self.auth_provider = lambda host: dict(username=username, password=password)
+ self.auth_provider = PlainTextAuthProvider(username=username, password=password)
self.keyspace = keyspace
self.tracing_enabled = tracing_enabled
self.expand_enabled = expand_enabled
[2/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e64c301d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e64c301d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e64c301d
Branch: refs/heads/trunk
Commit: e64c301dd37d36d543545b7ee44c00d71a3bfd18
Parents: 22f811e e4b40c7
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Thu Jul 17 14:45:07 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Thu Jul 17 14:45:07 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e64c301d/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e64c301d/bin/cqlsh
----------------------------------------------------------------------
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ty...@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/1a58ecc2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a58ecc2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a58ecc2
Branch: refs/heads/trunk
Commit: 1a58ecc266260fae9f734681449511b01ad3e97a
Parents: 41a91e9 e64c301
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Thu Jul 17 14:45:31 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Thu Jul 17 14:45:31 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a58ecc2/CHANGES.txt
----------------------------------------------------------------------