don't let test pass by default
Merge branch 'cassandra-1.2' into cassandra-2.0
add back ScrubTest
patch by Tyler Hobbs; reviewed by jbellis for CASSANDRA-5730
Don't add extraneous field with CqlStorage
Patch by Sam Tunnicliffe, reviewed by Alex Liu for CASSANDRA-6071
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
Fixes for speculative retry
patch by ayeschenko and jbellis for CASSANDRA-5932
fix subList bug
stronger warning to avoid 0.0.0.0 rpc_address
Merge branch 'cassandra-1.2' into cassandra-2.0
make sequential nodetool repair the default
patch by ltodorov reviewed by dbrosius for cassandra-5950
fix typo in test
Merge branch 'cassandra-1.2' into cassandra-2.0
remove deprecation
Track and persist sstable read activity
patch by Tyler Hobbs; reviewed by jbellis for CASSANDRA-5515
add RestorableMeter
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
Add more hooks for compaction strategy implementations

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6111
Fix memtable flushing for indexed tables

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6112
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