don't declare throwing exceptions that aren't
remove dead field
avoid npe chance, use == with enums
Ninja: fix test for js return type under rhino engine
Temporary fix for CASSANDRA-8326

This is a temporary python driver fix for CASSANDRA-8326.  The patch
has not been properly reviewed and tested by the python driver team.
The driver version bundled here can be found at the following branch:

https://github.com/thobbs/python-driver/tree/CASSANDRA-8326-temp-fix
Fix IRE with ORDER BY, treating all selections as fns

Patch by Tyler Hobbs; reviewed by Benjamin Lerer for CASSANDRA-8286
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Fix multicolumn relation + COMPACT STORAGE issues

Patch by Tyler Hobbs; reviewed by Benjamin Lerer for CASSANDRA-8264
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Fix CONTAINS (KEY) filtering on frozen collection clustering cols

Patch by Tyler Hobbs; reviewed by Benjamin Lerer for CASSANDRA-8302
Merge branch 'cassandra-2.1' into trunk
Centralize shared executors

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

Conflicts:
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
	src/java/org/apache/cassandra/db/HintedHandOffManager.java
	src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
	src/java/org/apache/cassandra/service/StorageService.java
	test/unit/org/apache/cassandra/db/KeyCacheTest.java
improve JBOD disk utilization
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/compaction/CompactionManager.java
	src/java/org/apache/cassandra/db/compaction/Scrubber.java
	src/java/org/apache/cassandra/service/StorageService.java
	src/java/org/apache/cassandra/streaming/StreamReader.java
bump python version to 2.7
Merge branch 'cassandra-2.1' into trunk
Merge remote-tracking branch 'origin/trunk' into 7874-jsr223