fix typo
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Ninja fix debian rules to handle versions with -N package convention
Merge branch 'cassandra-2.1' into trunk
CrcCheckChance should adjust based on live CFMetadata not sstable metadata

patch by tjake; reviewed by Jason Brown for CASSANDRA-7978
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Adds test for CASSANDRA-7978
Merge branch 'cassandra-2.1' into trunk
Accept dollar-quoted strings in CQL

Patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-7769
Fix CASSANDRA-6075

patch by Aleksey Yeschenko and Benjamin Lerer
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	test/unit/org/apache/cassandra/cql3/SelectWithTokenFunctionTest.java
Merge branch 'cassandra-2.1' into trunk
Trunk Test fixes

Patch by Carl Yeksigian; reviewed by tjake for CASSANDRA-7991
Optimize java source-based UDF invocation

Patch by Robert Stupp; reviewed by Benjamin Lerer for CASSANDRA-7924
Fix pig tests on Windows

patch by Benjamin Lerer; reviewed by Josh McKenzie for CASSANDRA-7986
Merge remote-tracking branch 'origin/trunk' into 7396-coll-slice