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

Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Make sure we don't try to compact already compacting sstables in HHOM

Patch by marcuse; reviewed by jbellis for CASSANDRA-7288
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
xmx
explain how to specify a keyspace
Merge branch 'cassandra-2.0' into cassandra-2.1
merge from 2.1
emphasize using sstablerepairedset with LCS
Merge branch 'cassandra-2.1' into trunk
add src/resources to the generate eclipse .project file's src paths

patch by opeer reviewed by dbrosius for cassandra-5964
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Use HadoopCompat to get job context
Patch by Ben Coverston, reviewed by brandonwilliams for CASSANDRA-7315
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Backport MultiSliceRequest

Patch by Ed Capriolo; Reviewed by tjake for CASSANDRA-7027