Fix error messages
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Export JVM_OPTS in debian init

Patch by Matt Robenolt, reviewed by Michael Shuler for CASSANDRA-7802
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	debian/init
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Fix CFMetaData#isThriftCompatible() for PK-only tables

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7832
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Support non-equals conditions for LWT

Patch by Tyler Hobbs; review by Sylvain Lebresne for CASSANDRA-6839
Merge branch 'cassandra-2.1' into trunk
UDF cleanups

patch by slebresne; reviewed by thobbs for CASSANDRA-7809
Add syntax to remove multiple elements from a map

patch by blerer & slebresne; reviewed by iamaleksey for CASSANDRA-6599
Merge branch 'cassandra-2.1' into trunk
Track expired tombstones

Patch by marcuse; reviewed by slebresne for CASSANDRA-7810
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/ColumnIndex.java
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk