Update scrub for single-pass compaction format
patch by jasobrown; reviewed by slebresne for CASSANDRA-5429
Rename Table to Keyspace

patch by Jeremiah Jordan; reviewed by Aleksey Yeschenko for
CASSANDRA-5613
typo
Race condition in detecting version on a mixed 1.1/1.2 cluster
patch by Sergio Bossa; reviewed by jasobrown for CASSANDRA-5692
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/net/OutboundTcpConnection.java
changes.txt
Merge branch 'cassandra-1.2' into trunk
Convert speculative retry from milli second to micro second.
patch by Vijay; reviewed by slebresne for CASSANDRA-5014
Remove homegrown and now unused Throttle class
Fix loading key cache when a saved entry is no longer valid
patch by Fabien Rousseau; reviewed by jbellis for CASSANDRA-5706
merge from 1.2
spelling
Merge branch 'cassandra-1.2' into trunk
Refactor IESCS in Snitches, (part 2 - rework YFNTS)
patch by jasobrown; reviewed by jbellis for CASSANDRA-5681
fix up logging contexts to match class
exit(1) on IOException trying to read from a file
patch by Steve Peters; reviewed by jbellis for CASSANDRA-5247
Merge branch 'cassandra-1.2' into trunk
fix minor javadoc issues
remove redundant startTime
Fix sometimes skipping range tombstones during reverse queries

patch by slebresne; reviewed by jbellis for CASSANDRA-5712