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.1' into trunk

This commit is contained in:
Tyler Hobbs 2015-02-12 12:33:47 -06:00
parent b2123dbb76 5c9d73209f
commit 732e006388
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/cqlsh
View File

@ -482,7 +482,7 @@ def auto_format_udts():
make_udt_class = cassandra.cqltypes.UserType.make_udt_class
def new_make_udt_class(cls, *args, **kwargs):
udt_class = make_udt_class(*args, **kwargs)
formatter_for(udt_class.typename)(format_value_utype)
formatter_for(udt_class.tuple_type.__name__)(format_value_utype)
return udt_class
cassandra.cqltypes.UserType.make_udt_class = classmethod(new_make_udt_class)

3
src/java/org/apache/cassandra/config/DatabaseDescriptor.java
View File

@ -1381,8 +1381,7 @@ public class DatabaseDescriptor
public static int getSSTablePreempiveOpenIntervalInMB()
{
//return conf.sstable_preemptive_open_interval_in_mb;
return -1;
return conf.sstable_preemptive_open_interval_in_mb;
}
public static boolean getTrickleFsync()