Fix race in FileCacheService RemovalListener
patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-7278
Merge branch 'cassandra-2.0' into cassandra-2.1
Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM operations to incorrect become full QUORUM
patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-7345
merge from 2.0
Improve schema merge performance

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7444
Properly handle unrecognized opcodes and flags

Patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-7440
Merge branch 'cassandra-2.0' into cassandra-2.1
Fix NPE when unknown prepared statement ID is used

Patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-7454
close CqlRecordWriter clients when finished
patch by Peter Williams; reviewed by jbellis for CASSANDRA-7459
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
(Windows) handle spaces in path names
patch by Josh McKenzie; reviewed by Jorge Bay for CASSANDRA-7451
merge from 2.1.0
Adjust MT depth based on # of partitions validating

patch by yukim; reviewed by jbellis for CASSANDRA-5263
Include high level sstables in lower level compactions if not compacted for a while.

Patch by marcuse, reviewed by kohlisankalp and yukim for CASSANDRA-7414
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
Merge commit failure policy into 2.1

patch by Benedict Elliott Smith; reviewed by Marcus Eriksson for CASSANDRA-7429
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Optimise CellName/Composite comparisons for NativeCell

patch by Jake Luciani and Benedict Elliott Smith for CASSANDRA-6755
fix CHANGES.txt