Ninja-fix CQL3 doc
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
simple naming fixes
Fix thundering herd on endpoint cache invalidation
patch by rbranson and jbellis for CASSANDRA-6345
merge from 1.2
Merge branch 'cassandra-2.0' into trunk
fix build
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
fix build more
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
fix merge
Merge branch 'cassandra-2.0' into trunk
add snapshot space used to cfstats
patch by Mikhail Stepura; reviewed by jbellis for CASSANDRA-6231
r/m debug output
merge from 1.2
Merge branch 'cassandra-2.0' into trunk
Fix cfstats not handling index CF

patch by Mikhail Stepura; reviewed by yukim for CASSANDRA-6406