ninja fix rethrow InterruptedException in cassandra-stress Timing.snap
fix format string to match the number of input values
format doubles with %f
don't call getCompactions thru the proxy twice for compactionstats
Don't allow simultaneous bootstrap when cassandra.consistent.rangemovement is true

Patch by brandonwilliams, reviewed by tjake for CASSANDRA-7069
Use ThreadLocalRandom and remove FBUtilities.threadLocalRandom

patch by benedict; reviewed by tjake for CASSANDRA-7934
ninja-fix CHANGES.txt
ninja-fix cassandra-stress totalGcStats metric
Better error checking of stress profile

patch by tjake; reviewed by belliottsmith for CASSANDRA-7716
Fix logging dir in debian package

Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-7941
fix format string to match count of values
ninja fix cassandra-stress pre-2.1.1 compatibility
Fix saving caches when a table is dropped

patch by Aleksey Yeschenko; reviewed by Benedict Elliott Smith for
CASSANDRA-7784
Metrics for prepared stmt usage and eviction

Patch by Robbie Strickland; review by Tyler Hobbs for CASSANDRA-7930
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
	src/java/org/apache/cassandra/metrics/CqlStatementMetrics.java
Revert "Metrics for prepared stmt usage and eviction"

This reverts commit 19c6cc1982d2146a99ccaf6dccc087fe88d5785f.
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
cassandra-stress: fix support for NetworkTopologyStrategy

patch by benedict; reviewed by yukim for CASSANDRA-7945
Invalidate prepared stmts when ks or table is dropped

Patch by Viju Kothuvatiparambil; review by Tyler Hobbs for
CASSANDRA-7566
Prevent NPE on FD conviction race

Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7940