Fix broken build
Merge branch 'cassandra-2.1' into trunk
Improve error message when trying >= 2.0 on java < 1.7

Patch by brandonwilliams reviewed by thobbs for CASSANDRA-7137
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	conf/cassandra-env.sh
Merge branch 'cassandra-2.1' into trunk
Remove unused isLocalTask method.

Patch by Lyuben Todorov, reviewed by brandonwilliams for CASSANDRA-7181
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Add snapshot "manifest" describing files included
patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-6326
Merge branch 'cassandra-2.1' into trunk
don't use o.a.commons.io for one method
Merge branch 'cassandra-2.1' into trunk
return all cpu values from BackgroundActivityMonitor.readAndCompute

patch by dbrosius reviewed by jbellis for cassandra-7183
Merge branch 'cassandra-2.0' into cassandra-2.1
make sure manifest's parent dirs exist before trying to write the file.
Merge branch 'cassandra-2.1' into trunk
reduce garbage creation in calculatePendingRanges

patch by dbrosius reviewed by bwilliams for cassandra-7191
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk