Remove deprecated native_transport_min_threads option
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Fix dateOf() function for pre-2.0 timestamp columns

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-5928
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Disallow incompatible type change in CQL3

patch by slebresne; reviewed by iamaleksey for CASSANDRA-5882
Fix SSTable unintentionally loads BF in batch mode

patch by yukim; reviewed by jbellis for CASSANDRA-5938
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Versions for 1.2.9 release
Allow disabling SlabAllocator
patch by jbellis; reviewed by jasobrown for CASSANDRA-5935
Make user-defined compactionJMX blocking
patch by jbellis; reviewed by Michael Harris for CASSANDRA-4952
merge from 1.2
Merge branch 'cassandra-2.0' into trunk
use sstable partitioner for SSTableScanner
patch by jbellis; reviewed by Aleksey Yeschenko for CASSANDRA-2524
Merge branch 'cassandra-2.0' into trunk
Fix QueryPagerTest
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk