natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.11' into trunk

This commit is contained in:
Andrés de la Peña 2017-08-24 17:03:41 +01:00
parent 2e5847d29b 000007f67c
commit 4b777d6271
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -130,6 +130,7 @@
* Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512) * Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512)
* Properly evict pstmts from prepared statements cache (CASSANDRA-13641) * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
Merged from 3.0: 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) * Potential AssertionError during ReadRepair of range tombstone and partition deletions (CASSANDRA-13719)
* Don't let stress write warmup data if n=0 (CASSANDRA-13773) * Don't let stress write warmup data if n=0 (CASSANDRA-13773)
* Randomize batchlog endpoint selection with only 1 or 2 racks (CASSANDRA-12884) * Randomize batchlog endpoint selection with only 1 or 2 racks (CASSANDRA-12884)

6
bin/cqlsh.py
View File

@ -1959,6 +1959,12 @@ class Shell(cmd.Cmd):
else: else:
session = conn.connect() 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 # Update after we've connected in case we fail to authenticate
self.conn = conn self.conn = conn
self.auth_provider = auth_provider self.auth_provider = auth_provider