add missing String.format parameter
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Add missing file
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Fix TokenMetadataTest
remove unnecessary(and failing) test
Merge branch 'cassandra-2.0' into trunk
Fix ScrubTest
Fix LeaveAndBootstrapTest
Fix potential ConcurrentModificationException in tests
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	test/unit/org/apache/cassandra/db/ScrubTest.java
	test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
Merge branch 'cassandra-2.0' into trunk
change MIN_SANE_LIVE_RATIO logging to debug
patch by jbellis for CASSANDRA-5377
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
add #6142 to CHANGES + NEWS
Bump Xss to 256k to match 2.0+ (CASSANDRA-5517)
Merge branch 'cassandra-1.2' into cassandra-2.0