You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ad...@apache.org on 2017/08/24 15:39:29 UTC
[1/2] cassandra git commit: Copy session properties on cqlsh.py
do_login
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.11 ed9b04d6a -> 000007f67
Copy session properties on cqlsh.py do_login
patch by Andres de la Peña; reviewed by Zhao Yang for CASSANDRA-13640
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9497191f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9497191f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9497191f
Branch: refs/heads/cassandra-3.11
Commit: 9497191f5bab126c4d83ccbe023554fd6ea95257
Parents: 3960260
Author: Andrés de la Peña <a....@gmail.com>
Authored: Thu Aug 24 16:29:11 2017 +0100
Committer: Andrés de la Peña <a....@gmail.com>
Committed: Thu Aug 24 16:29:11 2017 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh.py | 6 ++++++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9497191f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1525289..936b72c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.15
+ * Copy session properties on cqlsh.py do_login (CASSANDRA-13640)
* Fix ColumnDefinition.cellValueType() for non-frozen collection and change SSTabledump to use type.toJSONString() (CASSANDRA-13573)
* Skip materialized view addition if the base table doesn't exist (CASSANDRA-13737)
* Drop table should remove corresponding entries in dropped_columns table (CASSANDRA-13730)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9497191f/bin/cqlsh.py
----------------------------------------------------------------------
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index c132592..8eb42a3 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -2206,6 +2206,12 @@ class Shell(cmd.Cmd):
else:
session = conn.connect()
+ # Copy session properties
+ session.default_timeout = self.session.default_timeout
+ session.row_factory = self.session.row_factory
+ session.default_consistency_level = self.session.default_consistency_level
+ session.max_trace_wait = self.session.max_trace_wait
+
# Update after we've connected in case we fail to authenticate
self.conn = conn
self.auth_provider = auth_provider
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ad...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/000007f6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/000007f6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/000007f6
Branch: refs/heads/cassandra-3.11
Commit: 000007f67cdecac0187a336ce654a14c6f56fc01
Parents: ed9b04d 9497191
Author: Andrés de la Peña <a....@gmail.com>
Authored: Thu Aug 24 16:34:03 2017 +0100
Committer: Andrés de la Peña <a....@gmail.com>
Committed: Thu Aug 24 16:34:03 2017 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh.py | 6 ++++++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/000007f6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b22cb5e,936b72c..d39f78c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,5 +1,17 @@@
-3.0.15
+3.11.1
+ * Fix cassandra-stress hang issues when an error during cluster connection happens (CASSANDRA-12938)
+ * Better bootstrap failure message when blocked by (potential) range movement (CASSANDRA-13744)
+ * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
+ * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
+ * Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512)
+ * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
+Merged from 3.0:
+ * Copy session properties on cqlsh.py do_login (CASSANDRA-13640)
+ * Potential AssertionError during ReadRepair of range tombstone and partition deletions (CASSANDRA-13719)
+ * Don't let stress write warmup data if n=0 (CASSANDRA-13773)
+ * Gossip thread slows down when using batch commit log (CASSANDRA-12966)
+ * Randomize batchlog endpoint selection with only 1 or 2 racks (CASSANDRA-12884)
+ * Fix digest calculation for counter cells (CASSANDRA-13750)
* Fix ColumnDefinition.cellValueType() for non-frozen collection and change SSTabledump to use type.toJSONString() (CASSANDRA-13573)
* Skip materialized view addition if the base table doesn't exist (CASSANDRA-13737)
* Drop table should remove corresponding entries in dropped_columns table (CASSANDRA-13730)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/000007f6/bin/cqlsh.py
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org