omit zero counts from compaction merge summary
Merge branch 'cassandra-2.0' into trunk
rows,columns -> partitions,cells
don't force flush of compaction_history after each compaction
patch by jbellis; reviewed by yukim for CASSANDRA-6287
cleanup tokens messages
issue number typo
improve Validator output a bit
merge from 2.0
use StandardCharsets static fields
patch by Blair Zajac; reviewed by jbellis for CASSANDRA-6290
merge from 2.0
Fix typo
Add user-defined types to CQL3

patch by slebresne; reviewed by iamaleskey for CASSANDRA-5590
Error out correctly when frame is too large

patch by slebresne; reviewed by dnorberg for CASSANDRA-5981
Merge branch 'cassandra-2.0' into trunk
add non-jamm path for cached statements
patch by Michael Stepura; reviewed by jbellis for CASSANDRA-6293
merge from 1.2
Merge branch 'cassandra-2.0' into trunk
make calculatePendingRanges asynchronous
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk