make sequential nodetool repair the default
patch by ltodorov reviewed by dbrosius for cassandra-5950
Merge branch 'cassandra-2.0' into trunk
fix typo in test
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
remove deprecation
Merge branch 'cassandra-2.0' into trunk
Track and persist sstable read activity
patch by Tyler Hobbs; reviewed by jbellis for CASSANDRA-5515
Merge branch 'cassandra-2.0' into trunk
add RestorableMeter
Merge branch 'cassandra-2.0' into trunk
track coordinator latency and use that instead of local for read speculation; fix round-trip of percentile through string
make 99percentile the default speculative retry
merge from 2.0
Add more hooks for compaction strategy implementations

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6111
Merge branch 'cassandra-2.0' into trunk
Fix memtable flushing for indexed tables

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6112
Merge branch 'cassandra-2.0' into trunk
Fix memtable flushing for indexed tables

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6112

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/compaction/CompactionManager.java
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/db/compaction/CompactionManager.java