comment
Merge branch 'cassandra-2.1' into trunk
Validate token() args are in partition key order

Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-6075
Merge branch 'cassandra-2.0' into cassandra-2.1
Validate token() args are in partition key order

Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-6075
Merge branch 'cassandra-2.1' into trunk
Fix resource leak in event of corrupt sstable

patch by benedict; review by yukim for CASSANDRA-7932
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/compaction/CompactionManager.java
	src/java/org/apache/cassandra/db/compaction/CompactionTask.java
Fix tests by making QP use its own executor
Merge branch 'cassandra-2.1' into trunk
cqlsh: Fix UDT field selection

Patch by Philip Thompson; reviewed by Tyler Hobbs for CASSANDRA-7891
Merge branch 'cassandra-2.1' into trunk
Fix NPE when table dropped during streaming

patch by yukim; reviewed by krummas for CASSANDRA-7946
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
(cqlsh) Tab completeion for indexes on map keys.

patch by Philip Thompson; reviewed by Mikhail Stepura for CASSANDRA-7972
Merge branch 'cassandra-2.1' into trunk
ninja-fix stress: rate limit not honoured for warmup, and 'auto' rate mode optional with thread ranges
Merge branch 'cassandra-2.1' into trunk
fix typo