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

Merge branch 'cassandra-2.2' into cassandra-3.0

This commit is contained in:
Stefania Alborghetti 2016-06-01 15:32:48 +02:00
parent 4aaf2b34f0 43e9d2936e
commit f99f8a8c82
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -19,6 +19,7 @@ Merged from 2.2:
* Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
* Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395)
Merged from 2.1:
* cqlsh: apply current keyspace to source command (CASSANDRA-11152)
* Backport CASSANDRA-11578 (CASSANDRA-11750)
* Clear out parent repair session if repair coordinator dies (CASSANDRA-11824)
* Set default streaming_socket_timeout_in_ms to 24 hours (CASSANDRA-11840)

1
bin/cqlsh.py
View File

@ -2005,6 +2005,7 @@ class Shell(cmd.Cmd):
subshell = Shell(self.hostname, self.port,
color=self.color, encoding=self.encoding, stdin=f,
tty=False, use_conn=self.conn, cqlver=self.cql_version,
keyspace=self.current_keyspace,
display_timestamp_format=self.display_timestamp_format,
display_date_format=self.display_date_format,
display_nanotime_format=self.display_nanotime_format,