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

merge from 2.1

This commit is contained in:
Jonathan Ellis 2015-08-24 20:09:22 -05:00
parent e667993b96 f5d0595b6e
commit 1992598ecc
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

@ -12,6 +12,7 @@
* UDF / UDA execution time in trace (CASSANDRA-9723)
* Fix broken internode SSL (CASSANDRA-9884)
Merged from 2.1:
* (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)
* (cqlsh) Allow encoding to be set through command line (CASSANDRA-10004)

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)