typo
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Split out outgoing stream throughput within a DC and inter-DC
patch by Vijay and benedict for CASSANDRA-6596
Merge branch 'cassandra-2.0' into cassandra-2.1.0
rename
Merge branch 'cassandra-2.1' into trunk
Upgrade to snappy-java 1.0.5.2
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Make sure cql-test only run CQLTester ones
Merge branch 'cassandra-2.1.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
improve repair concurrency
add CASSANDRA-3569
cap max job threads