Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 1a2ad2ee0 -> cf0b6d107
  refs/heads/cassandra-3.11 000007f67 -> 8d98a9923
  refs/heads/trunk 41ef972b1 -> 4838e81a6


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/1a2ad2ee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a2ad2ee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a2ad2ee

Branch: refs/heads/cassandra-3.11
Commit: 1a2ad2ee047a9ed2c5112376585323b27ebfb7b0
Parents: 5e57dd1
Author: Andrés de la Peña <a.penya.gar...@gmail.com>
Authored: Thu Aug 24 16:56:12 2017 +0100
Committer: Andrés de la Peña <a.penya.gar...@gmail.com>
Committed: Thu Aug 24 16:56:12 2017 +0100

----------------------------------------------------------------------
 CHANGES.txt  | 1 +
 bin/cqlsh.py | 6 ++++++
 2 files changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a2ad2ee/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2b49bc3..a35cc1b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.15
+ * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a2ad2ee/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-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to