Make LCS split compaction results over many directories

Patch by marcuse; reviewed by yukim for CASSANDRA-8329
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/Memtable.java
	src/java/org/apache/cassandra/db/compaction/CompactionTask.java
	src/java/org/apache/cassandra/io/util/DiskAwareRunnable.java
Better jamm 0.3.0 jar
Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/compaction/CompactionTask.java
Merge branch 'cassandra-2.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1
Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/cassandra into trunk
Validate size of indexed column values

patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-8280
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/CFDefinition.java
	src/java/org/apache/cassandra/cql3/ColumnNameBuilder.java
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
	src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
	src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
Merge branch 'cassandra-2.1' into trunk
Ignore Paxos commits for truncated tables

patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-7538
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/service/paxos/PaxosState.java
Merge branch 'cassandra-2.1' into trunk
Add DC-aware sequential repair

patch by Jimmy Mårdell; reviewed by yukim for CASSANDRA-8193
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/repair/RepairJob.java
	src/java/org/apache/cassandra/repair/RepairSession.java
	src/java/org/apache/cassandra/service/ActiveRepairService.java
	src/java/org/apache/cassandra/service/StorageService.java
	src/java/org/apache/cassandra/service/StorageServiceMBean.java
	src/java/org/apache/cassandra/tools/NodeCmd.java
	src/java/org/apache/cassandra/tools/NodeProbe.java
	src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/repair/RepairJob.java
	src/java/org/apache/cassandra/repair/RepairSession.java
	src/java/org/apache/cassandra/service/ActiveRepairService.java
	src/java/org/apache/cassandra/service/StorageService.java
	src/java/org/apache/cassandra/service/StorageServiceMBean.java
	src/java/org/apache/cassandra/tools/NodeProbe.java
	src/java/org/apache/cassandra/tools/NodeTool.java
Log failed host when preparing incremental repair

patch by Rajanarayanan Thottuvaikkatumana; reviewed by yukim for CASSANDRA-8228
Merge branch 'cassandra-2.1' into trunk
fix to run test
Merge remote-tracking branch 'origin/trunk' into 7563v3-udf-types