switch to use parameterized logging
Make Memtable.getEntyIterator() respect the cfs iterator

Currently it assumes StorageSerive.getPartitioner(), which is not
correct for 2i CFSs (LocalPartitioner)
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Fix potential deadlock in the native protocol

patch by slebresne; reviewed by jbellis for CASSANDRA-5926
Merge branch 'cassandra-1.2' into cassandra-2.0.0
Fix typo
Fix typo
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