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

merge from 2.2

This commit is contained in:
Jonathan Ellis 2015-08-24 20:10:14 -05:00
parent 27a97a5cfe 1992598ecc
commit ee9807e3ac
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -4,6 +4,7 @@
* Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917)
* Fix sstablerepairedset (CASSANDRA-10132)
Merged from 2.2:
* (cqlsh) default load-from-file encoding to utf-8 (CASSANDRA-9898)
* Avoid returning Permission.None when system_auth.permissions table does not
exist (CASSANDRA-10168)
* add CLEAR cqlsh command (CASSANDRA-10086)

2
pylib/cqlshlib/util.py
View File

@ -118,6 +118,6 @@ def get_file_encoding_bomsize(filename):
file_encoding, size = encoding, len(bom)
break
else:
file_encoding, size = "ascii", 0
file_encoding, size = "utf-8", 0
return (file_encoding, size)