Add USING to CREATE FUNCTION for CASSANDRA-7811
Improve error message from 7499
Update java driver to 2.0.5 (for hadoop)
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	build.xml
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
Merge branch 'cassandra-2.1.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
Merge branch 'cassandra-2.1' into trunk
Add missing license header
Save source exception in CorruptBlockException

ninja patch by Pavel Yaskevich; ninja reviewed by Aleksey Yeschenko
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
Fix failing unit tests (bad CASSANDRA-7744 merge)
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
warnings
warnings
remove dead local
don't declare throwing exceptions that aren't
imports cleanup