ninja fix rethrow InterruptedException in cassandra-stress Timing.snap
Merge branch 'cassandra-2.1' into trunk
remove orphanable field 'connectionFactory'
fix format string to match the number of input values
Merge branch 'cassandra-2.1' into trunk
format doubles with %f
Merge branch 'cassandra-2.1' into trunk
don't call getCompactions thru the proxy twice for compactionstats
Merge branch 'cassandra-2.1' into trunk
make sure streams get closed
remove dead code
Don't allow simultaneous bootstrap when cassandra.consistent.rangemovement is true

Patch by brandonwilliams, reviewed by tjake for CASSANDRA-7069
Merge branch 'cassandra-2.1' into trunk
Use ThreadLocalRandom and remove FBUtilities.threadLocalRandom

patch by benedict; reviewed by tjake for CASSANDRA-7934
ninja-fix CHANGES.txt
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
	src/java/org/apache/cassandra/service/QueryState.java
ninja-fix cassandra-stress totalGcStats metric
Merge branch 'cassandra-2.1' into trunk
Better error checking of stress profile

patch by tjake; reviewed by belliottsmith for CASSANDRA-7716
Merge branch 'cassandra-2.1' into trunk