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.0' into cassandra-2.1 

Conflicts:
	CHANGES.txt
This commit is contained in:
Aleksey Yeschenko 2014-08-18 21:59:31 +03:00
parent 77f6c25e6c 36382e5472
commit bc165174b0
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -16,6 +16,7 @@
* Configurable client timeout for cqlsh (CASSANDRA-7516)
* Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
Merged from 2.0:
* (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
* (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
* (cqlsh) cqlsh should automatically disable tracing when selecting
from system_traces (CASSANDRA-7641)
@ -28,6 +29,7 @@ Merged from 2.0:
* Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345)
* cqlsh fails when version number parts are not int (CASSANDRA-7524)
2.1.0
* Fix ordering of static cells (CASSANDRA-7763)
Merged from 2.0:

1
bin/cqlsh
View File

@ -738,6 +738,7 @@ class Shell(cmd.Cmd):
if readline.__doc__ is not None and 'libedit' in readline.__doc__:
readline.parse_and_bind("bind -e")
readline.parse_and_bind("bind '" + self.completekey + "' rl_complete")
readline.parse_and_bind("bind ^R em-inc-search-prev")
else:
readline.parse_and_bind(self.completekey + ": complete")
try: